.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/database.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/database.yml