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

Conflicts:
	.gitignore
	protected/runtime/application.log
auth