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

Conflicts:
	DanaiBeta/src/main/webapp/WEB-INF/views/danai.jsp