first working version
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle
	src/main/java/org/xaxox/Conf.java
	src/main/java/org/xaxox/MyEndPoint.java
	src/main/java/org/xaxox/config/MyWebAppInitializer.java
	src/main/java/org/xaxox/config/spring/BeansRepo.java
	src/main/webapp/js/app.js