Replaced <a> by button
Merge branch 'master' of https://github.com/khyiu/NXpense

Conflicts:
	nxpense/src/main/webapp/welcome.html