Updating repo to test connection.
Updating DB
Merge branch 'master' of https://github.com/AdaptedPro/cal_cms

Conflicts:
	config/database.yml