Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js

dist/bundle.js

@@ -35210,10 +35210,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             this._init();
             initState(this, state);
+            initMixins(this, mixins);
+            initMethods(this, actions);
             initComputed(this, computed);
             initWatch(this, watch$$1);
-            initMethods(this, actions);
-            initMixins(this, mixins);
             this.created && this.created();
             if (this.$$model) {
                 return this.model;

dist/fineui.js

@@ -35452,10 +35452,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             this._init();
             initState(this, state);
+            initMixins(this, mixins);
+            initMethods(this, actions);
             initComputed(this, computed);
             initWatch(this, watch$$1);
-            initMethods(this, actions);
-            initMixins(this, mixins);
             this.created && this.created();
             if (this.$$model) {
                 return this.model;

dist/fineui_without_jquery_polyfill.js

@@ -24243,10 +24243,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             this._init();
             initState(this, state);
+            initMixins(this, mixins);
+            initMethods(this, actions);
             initComputed(this, computed);
             initWatch(this, watch$$1);
-            initMethods(this, actions);
-            initMixins(this, mixins);
             this.created && this.created();
             if (this.$$model) {
                 return this.model;

dist/fix/fix.js

@@ -1332,10 +1332,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             this._init();
             initState(this, state);
+            initMixins(this, mixins);
+            initMethods(this, actions);
             initComputed(this, computed);
             initWatch(this, watch$$1);
-            initMethods(this, actions);
-            initMixins(this, mixins);
             this.created && this.created();
             if (this.$$model) {
                 return this.model;