photo and use image type for images.
Merge branch 'master' of github.com:trueter/MyMoment

Conflicts:
	Server/lib/userProxy.js
make all the things work.