Adding new stuff
Merge branch 'master' of github.com:zturnbow/Sencha13Hackathon into JeffsNewModels

Conflicts:
	Architect.xds
	app.html
	app/controller/RegisterController.js
	app/view/LoginView.js
	app/view/MainMenuView.js
	app/view/RegisterView.js
	metadata/controller/RegisterController
	metadata/view/LoginView
	metadata/view/MainMenuView
	metadata/view/RegisterView
Merge branch 'JeffsNewModels' of github.com:zturnbow/Sencha13Hackathon into JeffsNewModels