Freshened repo
Updated .gitignore
Merge branch 'develop' into staging