Moved mockup into WebContent and renamed to index.jsp
Merge remote-tracking branch 'origin/master'