add to devbuild script
Finally get some much needed cleanup. Fixed Edge 2 images and other misc build items
Merge branch 'master' of https://github.com/onslyde/server

Conflicts:
	src/main/webapp/index.html