Merge branch 'sean' of https://github.com/scubbasteve302/QRiosity
move dirs to WEB-INF
Merge branch 'master' of https://github.com/scubbasteve302/QRiosity