Add pictures
Merge branch 'master' of github.com:steron757/olivia

Conflicts:
	WebRoot/WEB-INF/web.xml
	WebRoot/css/style.css
	WebRoot/images/logo.gif
	WebRoot/images/sprite-icons.gif
	WebRoot/index.jsp