Database working on university computers, distributing to everyone
Merge branch 'master' of /vol/project/2012/271/g1227133/webapp
Fixed bug
Merging JS demo with main project