version 3 update
Merge branch 'master' of github-windows://openRepo/https://github.com/jamesadcock/TeamSync

Conflicts:
	Resources/mobileweb/alloy/constants.js
	Resources/mobileweb/alloy/controllers/events.js
	Resources/mobileweb/alloy/controllers/groupsettings.js
	Resources/mobileweb/alloy/controllers/homepage.js
	Resources/mobileweb/alloy/controllers/homepageRow.js
	Resources/mobileweb/alloy/controllers/index.js
	Resources/mobileweb/alloy/controllers/memberlist.js
	Resources/mobileweb/alloy/controllers/membersearch.js
	Resources/mobileweb/a
lloy/controllers/membersearchRow.js
	Resources/mobileweb/alloy/controllers/notices.js
	Resources/mobileweb/alloy/controllers/noticesRow.js
	Resources/mobileweb/alloy/controllers/signin.js
	Resources/mobileweb/alloy/controllers/signup.js
	Resources/mobileweb/alloy/controllers/useroptions.js
	Resources/mobileweb/alloy/styles/homepage.js
	Resources/mobileweb/alloy/styles/homepageRow.js
	Resources/mobileweb/alloy/styles/index.js
	Resources/mobileweb/alloy/styles/membersearch.js
	Resources/mobileweb/alloy/styles/membersearchRow.js
	Resources/mobileweb/alloy/styles/notices.js
	Resources/mobileweb/alloy/styles/noticesRow.js
	Resources/mobileweb/alloy/styles/signin.js
	Resources/mobileweb/alloy/styles/signup.js
	Resources/mobileweb/alloy/styles/useroptions.js
	Resources/mobileweb/app.js
	app/alloy.js
	app/controllers/events.js
	app/controllers/homepage.js
	app/controllers/homepageRow.js
	app/controllers/index.js
	app/controllers/notices.js
	app/views/events.xml
	app/views/groupsettings.xml
	app/views/homepage.xml
	app/views/homepageRow.xml
	app/views/index.xml
	app/views/notices.xml
	app/views/useroptions.xml
	plugins/ti.alloy/plugin.pyc
	tiapp.xml