Merge branch 'hotfix/fix-api-search'
Merge branch 'hotfix/sticky-signin'
Adding FIXME for old solr version
Merge pull request #149 from kyriog/patch-1

Adding FIXME for old solr version
Veryfing if projects really exist before trying to access them in API search
Merge pull request #150 from kyriog/develop

Fixing search API
Veryfing if projects really exist before trying to access them in API search
Merge branch 'hotfix/fix-search-api'
Merge branch 'hotfix/fix-search-api' into develop
Merge branch 'master' of https://github.com/ImaginationForPeople/imaginationforpeople

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

Hotfixing search API (master branch)
Merge pull request #152 from kyriog/develop

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