Merge branch 'master' of https://github.com/bstrx/doorlog

Conflicts:
	protected/views/Users/index.tpl