rebasing commits starting since master

Application related tags added into application.xml

New welcome file added

Main content div added into index.jsp

Footer added

Creating new branch with existing local branches

change-001

change-002

change-003
Change 1 on master
Merge branch 'master' into cr-002

Conflicts:
	web/index.jsp