continue dev webapp server side
Merge branch 'master' of github.com:dikonikon/Intensity