me too for wish pages, inspiration link
text change
added faqs
Merge branch 'master' of https://github.com/bohemeyer/meingrundeinkommen

Conflicts:
	app/assets/templates/wishes.html