added some temp file stuff to gitignore
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Merge branch 'master' of github.com:fairnopoly/fairnopoly
removed guard helpers from gemfile
Merge branch 'master' of https://github.com/fairnopoly/fairnopoly
Gemfile.lock
gitignore
gitignore
altered link size in message row
fixed categories
Merge branch 'master' of github.com:fairnopoly/fairnopoly
reenabled newsletter links
Merge branch 'master' of github.com:fairnopoly/fairnopoly
fixed #854 for master
fixed welcome_helper.spec
fixed newsletter links in registration modal and in footer
fixed newsletter links again
fix #815 - use js fallback for hovers on touch devices
Merge branch 'develop' of https://github.com/fairnopoly/fairnopoly into develop
styleguide + fixed #883