Category menu concept updated
Merge branch 'master' of https://github.com/telco2011/finances.git

Conflicts:
	src/main/webapp/WEB-INF/pages/app/welcome.html
	src/main/webapp/resources/css/pagesstyle.css