Adding FIXME for old solr version
Merge pull request #149 from kyriog/patch-1

Adding FIXME for old solr version
Merge branch 'hotfix/fix-search-api'
Merge branch 'master' of https://github.com/ImaginationForPeople/imaginationforpeople

Conflicts:
	apps/api/views/search.py
Merge branch 'hotfix/personalize-honeypot'
Merge branch 'master' of https://github.com/ImaginationForPeople/imaginationforpeople
Merge pull request #151 from kyriog/master

Hotfixing search API (master branch)
tweaked a bit the hp fields
Merge branch 'hotfix/tweak_honeypot' into develop