Merge branch 'master' of https://github.com/luelher/Agencia-Royal-Services

Conflicts:
	config/database.yml
Merge branch 'master' of https://github.com/luelher/Agencia-Royal-Services

Conflicts:
	config/database.yml