update
update
update
update
update
update
update
Merge branch 'master' of heroku.com:gemilang-pratama-polykem

Conflicts:
	app/views/dashboard/index.slim