Updated to version 1.2-SNAPSHOT
Merge branch 'master' into devel
Merge branch 'master' into devel

Conflicts:
	pom.xml
Updated the pom to use resteasy 2.3.5.Final and jackson 1.9.9