deleted vaadin project
Switched to GLassfish4 with JavaEE7 and JDK8. Corrected small issues in
pom files. Corrected version conflicts of rs web.xml. Removed jsf
support
merge with master
Merge remote-tracking branch 'origin/master' into emil/for-master