Merge remote-tracking branch 'origin/develop'

package.json

 {
   "name": "FlexBE App",
-  "version": "2.1.1",
+  "version": "2.1.4",
   "main": "src/main.js",
   "window": {
     "icon": "src/img/icon-128.png",

package.xml

 <package>
   <name>flexbe_app</name>
-  <version>2.1.3</version>
+  <version>2.1.4</version>
   <description>
      flexbe_app provides a user interface (editor + runtime control) for the FlexBE behavior engine.
   </description>

src/io/io_codegenerator.js

@@ -39,7 +39,8 @@ IO.CodeGenerator = new (function() {
 		// generate import lines
 		var import_list = [];
 		for (var i=0; i<imported_states.length; ++i) {
-			if (!UI.Settings.isExplicitStates() && WS.Statelib.isClassUnique(imported_states[i].getStateClass())) {
+			if (imported_states[i] instanceof BehaviorState ||
+				!UI.Settings.isExplicitStates() && WS.Statelib.isClassUnique(imported_states[i].getStateClass())) {
 				import_list.push("from " + imported_states[i].getStateImport() + " import " + imported_states[i].getStateClass());	
 			} else {
 				import_list.push("from " + imported_states[i].getStateImport() + " import " + imported_states[i].getStateClass()