client jsp
Merge branch 'master' of https://github.com/Shortfinga/ALAS

Conflicts:
	alas/target/m2e-wtp/web-resources/META-INF/maven/de.wwi2011v.project/alas/pom.properties

client update
Merge branch 'master' of https://github.com/Shortfinga/ALAS