show inputs for selling form for #618
friendly percent no1 for #618
Merge branch 'release-lizzie' into feature-friendly-percent
ngo and friendlypercent
show more information for ngo js for #618
show more information for ngo js for #618
remove quote that made it onto the website
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
Merge branch 'release-lizzie' into develop
Merge branch 'release-lizzie' into feature-friendly-percent
friendly percent fixes for #618
friendly percent fixes for #618
friendly percent fixes for #618
friendly percent fixes for #618
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