Added basic web application support
Merge remote-tracking branch 'origin/Next' into Next