Merge branch 'hotfix-1.1.1' into develop
Merge branch 'hotfix-1.1.2' into develop
Merge branch 'hotfix-1.1.3' into develop
This will prevent errors when our key changes or we need to switch to a different format.
These headers should be set by the webserver, we should also work on testing.
Adding basset to improve our asset loading, fixed some file naming errors.
Bumped version number to 1.2
Merge branch 'release-1.2'