Merge origin/master

Conflicts:
	protected/runtime/application.log
Merge pull request #2 from bruntha1991/master

crew edited
mycommit
Image displayed
Image displayed
Image displayed and Create started
Merge origin/master

Conflicts:
	protected/views/crew/_view.php
	protected/views/crew/index.php
commit for save
commit for save
Merge pull request #6 from bruntha1991/master

I have given youa pull req
Revert "commit for save"

This reverts commit 136de6e5cee83281bab442ff4be04f727b5c5d98.
Merge branch 'master' of git://github.com/Prakhash/Moralit

Conflicts:
	protected/runtime/application.log
	protected/views/crew/index.php
Merge pull request #8 from aarthika-nathan/master

pull 3
Merge origin/master
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
Merge pull request #9 from aarthika-nathan/master

aarthi
Home page admin modified
Merge origin/master