Adjustments
Ignore node_module
add ignore node modules update
test
Merge remote-tracking branch 'upstream/master'
delete grunt
Merge branch 'sentry' of https://github.com/fathur/ditemukan into sentry

Conflicts:
	.gitignore
	app/controllers/UsersController.php
	app/routes.php

All conflict repaired