minor revise
Merge branch 'master' of github.com:FXuZ/colock-server

Conflicts:
	.gitignore
minor revise on settings
Merge branch 'master' of github.com:FXuZ/colock-server

Conflicts:
	colock/settings.py.template