Merge origin/master

Conflicts:
	src/main/java/com/workingflows/js/jquery/client/api/JQueryElement.java