resources
Merge branch 'master' into development

* master:
  resources

Conflicts:
	.gitignore
	db/development.sqlite3
	db/production.sqlite3