Merge branch 'release/v1.0.0'
Merge branch 'release/v1.0.1'
Update ocd_theme_ambrosia.gemspec
Updates protocol to avoid mixed active content warnings.
Merge branch 'master' of github.com:oc-digital/ocd_theme_ambrosia
Updates gemspec
Updates gemspec and bumps version.
Merge branch 'release/v1.0.2'

Conflicts:
	ocd_theme_ambrosia.gemspec