mmm
Merge branch 'master' of https://github.com/mkoldobsky/qrin

Conflicts:
	db/development.sqlite3