Conflict template mainmenuheader, menucifheader, header
Merge branch 'master' of https://github.com/bustanil/minifinance.git

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