Modified gemfile
Merge branch 'model' of https://github.com/omaru/intercom into model

Conflicts:
	Gemfile.lock
Mysql Database set up plus seeds for cuu only