Fixed annotations
Merge branch 'master' of github.com:timothyjlaurent/MobileCloudProject

Conflicts:
	Resources/app.js