Merge branch 'master' into master18
premium plan master 18 ON
Merge branch 'master' into master18
dashboard sidebar hidupin lagi
demographic link edit
Merge branch 'master' into master18

Conflicts:
	coding/application/views/a/dashboard/dashboard_sidebar_view.php
Merge branch 'master' into master18
updated
updated sidebar view
updated! korean updates module
Project Winner makeover
Merge branch 'master18'