no message
Merge branch 'master' of https://github.com/domiworks/woh_haja_ikg

Conflicts:
	app/views/layouts/admin_layout.blade.php