Add webapps integration
Merge remote-tracking branch 'shiznix/master'