- db.yml
Merge branch 'master' of github.com:parishphilp/cogsmart

Conflicts:
	.gitignore
	lib/tasks/screen_loader.rake