Merge branch 'release/1.1.1'
Merge branch 'release/1.2.0'
Reduced redundancy in the site-setup.sh script for rebuilding and seeding databases. Also allowed for a `./site-setup.sh --rebuild-db` argument to answer 'y' to the rebuild question without being prompted.
Merge branch 'hotfix/1.2.1' into develop