update
Merge branch 'master' of https://github.com/jamesadcock/TeamSync.git

Conflicts:
	Resources/alloy/controllers/noticesRow.js
	Resources/mobileweb/alloy/controllers/addevent.js
	Resources/mobileweb/alloy/controllers/homepage.js
	Resources/mobileweb/alloy/controllers/homepageRow.js
	Resources/mobileweb/alloy/controllers/notices.js
	Resources/mobileweb/alloy/controllers/signin.js
	Resources/mobileweb/alloy/controllers/signup.js
	Resources/mobileweb/alloy/styles/signin.js
	Resources/mobileweb/alloy/styles/signup.js