Trying to get image with static resources to work.
Showing an image
Showing an image
Changed to xhtml strict
Rendering as pdf
Moved css and js to local
Added image (commented out)
Merge branch 'flying-saucer'

Conflicts:
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	src/main/webapp/WEB-INF/views/index.html
Merge fix