Fixed broken .gitignore, added WEB-INF folder that was being ignored.
Prepping for merge with development.
Merge branch 'develop' into release
Merge branch 'develop' into release