Update encoding check
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Update mass-upload csv-dummy-file and documentation
Add CFK teaser on welcome page with preliminary text
Changed get-share icon
Changed get-share icon again
HOTFIX - prevent double buy button click
Merge branch 'master' into develop
Merge branch 'develop' into feature-slideshow

Conflicts:
	app/views/welcome/index.html.haml