Merge branch 'master' of git://github.com/Prakhash/Moralit

Conflicts:
	protected/runtime/application.log
	protected/views/crew/index.php
Merge branch 'master' of git://github.com/Prakhash/Moralit

Conflicts:
	protected/runtime/application.log
	protected/views/crew/index.php