model translator
merge?
Merge branch 'master' of https://github.com/JoshuaKaminsky/PhotographySite

Conflicts:
	Photography.Data/Entities/UserEntity.cs
parameter name changes