Webapp branch ready to be re-integrated to master

Still need a little TLC but it's functional