modified
Merge branch 'WAP' of ssh://github.com/murali-kiran/CMS into WAP

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