fix back button
Merge branch 'develop' into michaelvakulik
none
Merge branch 'develop' of https://github.com/engagepoint/cmis-types-manager-b into develop
Merge branch 'develop' of https://github.com/engagepoint/cmis-types-manager-b into develop
Merge branch 'develop' of https://github.com/engagepoint/cmis-types-manager-b into develop
Merge branch 'develop' into michaelvakulik

Conflicts:
	cmis-types-manager-ejb/src/test/java/com/engagepoint/ejb/TestService.java
Junit Test for CustomJSONConvector
Merge branch 'develop' of https://github.com/engagepoint/cmis-types-manager-b into develop
Merge branch 'develop' into michaelvakulik
Junit Test for CustomJSONConvector new
Junit Test for CustomJSONConvector new fix
Merge remote-tracking branch 'origin/develop' into develop