minor changes
Merge pull request #1 from jackrr/mongo-and-express

Mongo and express, early beginnings of user stuff
pull and merge for Jack's updated server
Merge branch 'master' of https://github.com/jackrr/photo-place into photos

Conflicts:
	App/Resources/alloy/controllers/index.js
	App/app/controllers/index.js
	App/app/views/index.xml