Fixed merge bugs
Merge branch 'temp_diffs' into develop

Conflicts:
	README.md
	src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/query/QueryExecutorAdapter.java
	src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/query/QueryExecutorService.java
Fixing bugs after merge fault