local
Merge branch 'master' of https://github.com/Numf/sh.git

Conflicts:
	index.php
Merge branch 'master' of https://github.com/Numf/sh into work

Conflicts:
	index.php
	protected/modules/user/controllers/DefaultController.php