committed on 28-11-2014 6PM
Merge branch 'master' of https://github.com/inlightayatas/inlightnew

Conflicts:
	protected/views/forms/_form.php
	themes/inlight/css/AdminLTE.css