Merge branch 'refactor' into approval

Conflicts:
	config/database.yml