Merge branch 'develop' into beforeMerge

Conflicts:
	CloudStar/CloudStar-ejb/src/java/com/cloudstar/servicepersistence/mappers/FacebookChatsMapper.java
	CloudStar/CloudStar-war/src/java/com/cloudstar/controller/FacebookOAuthServlet.java
	CloudStar/CloudStar-war/web/Util/Google.json
Merge branch 'develop' of https://github.com/Cloud-Star/ServerJEE into develop