Merge origin/master

Conflicts:
	src/main/java/com/workingflows/js/jscore/client/api/promise/Promise.java
	src/main/java/com/workingflows/js/jscore/client/factory/Browser.java
	src/main/java/com/workingflows/js/jscore/client/factory/JS.java