Added welcome page
added
Merge branch 'master' of ssh://github.com/murali-kiran/CMS

Conflicts:
	src/main/webapp/WEB-INF/jsp/tiles/menu.jsp
modified