Merge with ver. 5
Merge branch 'master' of github.com:idega/com.idega.mobile into BRANCH_PLATFORM_5

Conflicts:
	src/java/com/idega/mobile/restful/impl/MobileWebserviceImpl.java