Merge branch 'hotfix/0.2.17' into develop

* hotfix/0.2.17:
  fix toggler
Merge branch 'hotfix/0.3.0' into develop

* hotfix/0.3.0:
  clean up controller a little
  move email styles to partial
Merge branch 'hotfix/0.2.17-text' into develop

* hotfix/0.2.17-text:
  remove version numbers from controllers
  add description to application controller
Merge branch 'hotfix/0.2.18' into develop

* hotfix/0.2.18:
  update jquery version and path
use jquery fo jank free scroll
Merge branch 'hotfix/0.3.1' into develop

* hotfix/0.3.1:
  use jquery for jank free scroll
Merge branch 'hotfix/0.3.2' into develop

* hotfix/0.3.2:
  make hover disable hover feel less inhibiting
Merge branch 'hotfix/0.3.3' into develop

* hotfix/0.3.3:
  fix call method
  fix the api controller put method
Merge branch 'hotfix/0.3.4' into develop

* hotfix/0.3.4:
  clean up search view and controller
Merge branch 'master' into develop

* master:
Merge branch 'master' into develop

* master:
  fix contact controller
Merge branch 'master' into develop

* master:
  Update README.md
  Update README.md
  change the url of the current tpl
  add a markup simple option i found i commonly use
Merge branch 'hotfix/0.3.5' into develop

* hotfix/0.3.5:
  use double quotes for content attribute of meta tags
block requests from semalt.com
add PW 2.5 htaccess updates
Merge branch 'hotfix/0.3.06'

* hotfix/0.3.06:
  add PW 2.5 htaccess updates
  block requests from semalt.com
Merge branch 'hotfix/0.3.06' into develop

* hotfix/0.3.06:
  add PW 2.5 htaccess updates
  block requests from semalt.com
don't use protocol for blocking semalt
Merge branch 'hotfix/0.3.07' into develop

* hotfix/0.3.07:
  don't use protocol for blocking semalt