Merge pull request #9 from scubbasteve302/sean

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