Added the jsp slideshow
added some image files
Merge branch 'master' of https://github.com/SouthAfricaDigitalScience/myFirst-portlet

Conflicts:
	docroot/input.jsp
Merge pull request #29 from SouthAfricaDigitalScience/primo

Merge docroot/input.jsp