Added more model and additions to existing models
Merge branch 'Create_Migration' of http://github.com/StyleASD/team_citadel into Create_Migration

Conflicts:
	app/config/local/database.php