first implementation of feedback captchas (unfinished)
Merge branch 'develop' into feature-feedback-captcha
solr 4
sunspot config
changed port to tomcat
sunspot solr
removed path again
Merge branch 'master' into develop
Merge branch 'develop' into feature-feedback-captcha

Conflicts:
	app/models/user.rb
	app/views/devise/registrations/new.html.haml
	app/views/transactions/edit.html.haml
	app/views/transactions/step2.html.haml
for #662
comment out test due to #809
test fixes for recaptcha issues
Merge branch 'feature-feedback-captcha' into develop
fix #778 - allow screenshots for feedbacks and send them in the emails
elastic seach start
fixed specs a bit and elastic things
elastic test
elastic search at its glance.... autocomplete finished for now
merged
updated readme