Fix issue #560 caused by "Blocked Loading Mixed Active Content" in Firefox 23+

Firefox 23+ doesn't load any content from a http source if on a page using https.
Add delayed_jobs
Merge branch 'develop' into feature-import
Merge branch 'hotfix-windows-mime' into develop
remove underline

looks weird all the time I hovered it.
fix #622

removed survey
update README to reflect current branching scheme
images dynamically loaded
images dynamically loaded
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'release-lizzie' into develop
Merge branch 'develop' into feature-import
Merge branch 'release-lizzie' into develop
implemented notices for uplaod errors #628
started to write feature tests for emails
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fix #636
fix #612

change DREAM TEAM to Dream-Team | use backslash for escaping the character "-"
fix #573

as alternative use article.actions.edit in https://github.com/fairnopoly/fairnopoly/blob/develop/app/views/articles/show/_article_contents.html.haml and skip this fix
Merge pull request #640 from dennym/patch-5

fix #573