Contents (of CMS) database creation in models.rb
Merge branch 'master' of github.com:MarcGarreau/clonewars_uncubed

Conflicts:
	database.db