Merge branch 'hotfix/7.4.1' into develop

* hotfix/7.4.1:
  * Repo-agnostic button
Merge branch 'hotfix/7.4.2' into develop

* hotfix/7.4.2:
  * Updated gems
Merge branch 'hotfix/7.4.3' into develop

* hotfix/7.4.3:
  * Rails 4.1.5 * Updated gems
Merge branch 'hotfix/7.4.4' into develop

* hotfix/7.4.4:
  * Updated badges
* Rails 4.1.6
* Fontawesome 4.2.0
* Added apple touch icon
* Improved application layout
* Removed `l` and `reload!` aliases for pry
* Updated gems
Merge branch 'release/8.0.0'

* release/8.0.0:
  * Rails 4.1.6 * Fontawesome 4.2.0 * Added apple touch icon * Improved application layout * Removed `l` and `reload!` aliases for pry * Updated gems
fixed merge conflict