update settings?
update models?
Merge branch 'master' of https://github.com/Cryptite/loka

Conflicts:
	settings.py
Merge branch 'master' of https://github.com/Cryptite/loka
Merge branch 'master' of https://github.com/Cryptite/loka
merge?