Merge branch 'master' of http://github.com/juleswhite/mobilecloud-14
Merge branch 'master' of https://github.com/theraulii/mobilecloud-14