DB Seed
Merge branch 'master' of https://github.com/gumarusveritrans/ragnarok
Merge branch 'master' of https://github.com/gumarusveritrans/ragnarok
Edit css and customer-merchant controller
Fix conflict