Adding Google openid integration
Updating CKeditor version
Merge origin/master

Conflicts:
	src/test/resources/data-access.properties
Updating CKeditor version