Merge remote-tracking branch 'origin/master' into java8

Conflicts:
	generator/pom.xml
	generator/src/main/java/org/stjs/generator/scope/ScopeBuilder.java
	generator/src/main/java/org/stjs/generator/type/ClassWrapper.java
	generator/src/main/java/org/stjs/generator/utils/ClassUtils.java
	generator/src/main/java/org/stjs/generator/utils/Operators.java
	generator/src/main/java/org/stjs/generator/writer/JavascriptWriter.java
	generator/src/main/java/org/stjs/generator/writer/JavascriptWriterVisitor.java
	generator/src/test/java/org/stjs/generator/writer/bridge/Bridge1.java
	generator/src/test/java/org/stjs/generator/writer/innerTypes/InnerTypesGeneratorTest.java
	maven-plugin-it/src/test/resources/package-js-jar/pom.xml
	maven-plugin-it/src/test/resources/package-js-war/pom.xml
	maven-plugin-it/src/test/resources/project-with-cycles/pom.xml
fix the last tests from merge