komit

Signed-off-by: Hari Santoso <hari.santoso@sangkuriang.co.id>
Merge branch 'master' of https://github.com/rizaramadan/ob-dashboard

Conflicts:
	js/js/maindashboard.js

resolved

Signed-off-by: Hari Santoso <hari.santoso@sangkuriang.co.id>