Merge branch 'master' of git@github.com:xwic/jWic.git

Conflicts:
	jWic/src_samples/de/jwic/demo/DemoApplication.java
	jWic/web/jwic/jwic_controls.js
Merge branch 'master' of git@github.com:xwic/jWic.git