Merge branch 'master' into local

Conflicts:
	.gitignore
Merge branch 'master' into local
Merge branch 'master' of github.com:FXuZ/colock-server into local

Conflicts:
	.gitignore