checking
changed
Merge branch 'master' of ssh://git@github.com/murali-kiran/CMS

Conflicts:
	src/main/webapp/WEB-INF/jsp/media/uploadApp1.jsp