added faq link
Merge branch 'develop' into faq-page
base faq view
done faq
cleaned small bug
Merge branch 'write-fixtures' into faq-page
Merge branch 'write-fixtures' into faq-page

Conflicts:
	src/Geekhub/DreamBundle/Resources/config/routing.yml
Merge branch 'write-fixtures' into faq-page
deleted faq.css
FAQ in resource bundle
Merge branch 'write-fixtures' into faq-page
Merge branch 'write-fixtures' into faq-page
Merge branch 'write-fixtures' into faq-page
Merge branch 'write-fixtures' into faq-page
Merge branch 'write-fixtures' into faq-page
Merge branch 'develop' into faq-page
Added missing guzzle dependency
test fix to captcha
test#2 fix to captcha
test#3 fix to captcha added composer.lock