user3
Merge branch 'master' of https://github.com/kemaldarmawan/DanaiBeta

Conflicts:
	DanaiBeta/src/main/java/com/danai/app/HomeController.java