Merge branch 'develop' into feature/preview_urls
updates settings to allow for ssl forwarding that happens on testing server
class based click handler added in edit_stage.html for preview feature
Merge pull request #31 from penzance/feature/preview_urls

preview html changes
Merge pull request #38 from penzance/feature/ssl_settings

updates local settings
Merge branch 'develop' into feature/deploy_url_options

Conflicts:
	ab_testing_tool_app/templates/edit_stage.html