logout
Merge branch 'master' of https://github.com/bustanil/minifinance.git
Merge branch 'master' of https://github.com/bustanil/minifinance.git
changed mainblank to index
login
Merge branch 'master' of https://github.com/bustanil/minifinance.git

Conflicts:
	src/main/webapp/template/mainmenuheader.xhtml