karma, protractor
Merge branch 'develop' into webapp
updated README
add jquery
update server
Merge branch 'feature/backend' into develop