-
level2
Merge branch 'master' of https://github.com/zlkoh/careershire

Conflicts:
	application/controllers/advertiser.php
	application/controllers/home.php
	application/views/advertiser/payment.blade.php
	application/views/advertiser/register.blade.php
	less/base.less
	public/css/main.css