Stashing local changes.
Merge branch 'master' of https://github.com/CommanderToad/Ourchive

Conflicts:
	Resources/iphone/alloy/controllers/addVideo.js
	Resources/iphone/alloy/controllers/homeView.js
	Resources/iphone/alloy/controllers/menu.js
	Resources/iphone/alloy/controllers/menurow.js
	Resources/iphone/alloy/controllers/myOurchive.js
	Resources/iphone/alloy/controllers/view2.js
	Resources/iphone/alloy/controllers/view3.js
	Resources/iphone/alloy/styles/addText.js
	Resources/iphone/alloy/styles/addVideo.js
	Resources/iphone/alloy/styles/homeView.js
	Resources/iphone/alloy/styles/index.js
	Resources/iphone/alloy/styles/menu.js
	Resources/iphone/alloy/styles/menurow.js
	Resources/iphone/alloy/styles/myOurchive.js
	Resources/iphone/alloy/styles/settings.js