Add all modal classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/aim/model/UserAccount.java