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

Conflicts:
	protected/views/crew/_view.php
	protected/views/crew/index.php