test comment #bitcodin-2 test-issue-maria add work Today 1h
Merge remote-tracking branch 'origin/master'

Conflicts:
	testdrive-protected/controllers/UserController.php
test comment #bitcodin-2 test-issue-maria add work Today 1h