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'
Merge branch 'hotfix/tweak_honeypot' into develop
removed field_name in error message
Merge branch 'hotfix/honeypotagain'
Merge branch 'hotfix/honeypotagain' into develop
Merge pull request #153 from kyriog/develop

Adding add picture to project to API
fixed header.js
Merge branch 'hotfix/sticky-signin-menu'
Merge branch 'hotfix/sticky-signin-menu' into develop
added call to header.js to base forum template (was not reached cause of sekizai)
Merge branch 'hotfix/sticky-menu-again'
Merge branch 'hotfix/sticky-menu-again' into develop