Changed instance name from imeji to edmond
fixed typo
preparation for edmond release
fixed bug in caroussel
https://github.com/imeji-community/imeji/issues/633
renamed the projekt to edmond
https://github.com/MPDL/Edmond/issues/4
Merge remote-tracking branch 'origin/Edmond'

Conflicts:
	pom.xml
	src/main/java/de/mpg/imeji/presentation/beans/PropertyBean.java
	src/main/webapp/UserAdministrationPage.xhtml
	src/main/webapp/Welcome.xhtml
	src/main/webapp/footerPages/Footer.xhtml
	src/main/webapp/headerPages/Header.jspf
	src/main/webapp/resources/css/theme_default/app.css
	src/main/webapp/resources/css/theme_default/style.css
	src/main/webapp/templates/component/header/header_default.xhtml
	src/main/webapp/templates/component/header/html_head_default.xhtml
	src/main/webapp/templates/template.xhtml