formatting group
adding finder to group
creating user model
Merge branch 'master' of github.com:tian2992/card_album

Conflicts:
	card-album-webapp/app/models/User.java