- Added user model
- Fixed model unit tests
Added Envelope, Trade, UserCard, UserEnvelope models w/tests
Updated OneToMany relationships
Minor formatting changes
Merge branch 'master' of https://github.com/tian2992/card_album

Conflicts:
	card-album-webapp/app/models/Album.java
	card-album-webapp/app/models/Card.java
	card-album-webapp/app/models/CardCategory.java
	card-album-webapp/app/models/CardSlot.java
	card-album-webapp/app/models/CardType.java
	card-album-webapp/test/models/GenericModelTest.java