change location folders(images, css, js), add test image to index
changed path to photo in index page
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/jsp/index.jsp