moved the SECRET back to the settings_local as this affects user logins
Merge commit '9a31419e487381563cb539d4712448bf0be5bea0'
Merge branch 'master' of https://github.com/OAButton/OAButton
* changed static load settings so that things work in dev properly
* moved non-SSL content onto local server
added a dummy SECRET_KEY for tests in travis
Merge branch 'develop' into features/215-ssl

Conflicts:
	oabutton/settings.py
Merge branch 'develop' into features/215-ssl
Merge pull request #217 from OAButton/features/215-ssl

Features/215 ssl