Update Solr to 3.6.1

Upgrade Solr from 1.4.1 to 3.6.1 - fixes liqd/adhocracy#64.

From a quick testing, this seems to work fine without further
modifications needed.

Full Solr changelog with upgrade hints can be found here:
http://svn.apache.org/repos/asf/lucene/dev/trunk/solr/CHANGES.txt
Adapt default branches to git move
Do not install geo extensions unless needed
build_debian: Version-independent postgres
Disable geo extensions (probably broken atm)
build_debian: Remove excessive spaces
Update distribute in virtualenv (Fixes build error with mysql-python)
bump amqplib dependency from 0.6.1 to 1.0.2
upgrade memcached from 1.4.7 to 1.4.15

This fixes a compilation issue on Mac OS X 10.8.
start git flow
Move from python-markdown2 to current python-markdown

This goes along with a840a459f89cef3e48c8c741d6c11a8c57dbb6ee in liqd/adhocracy
Add default feedback instance config parameters

This goes along with commit 10b766be7a15138b0ff4e6d4a6b2383c9d0a3694 in
liqd/adhocracy.
add configuration option which hides instance creator information

Conflicts:
	etc/adhocracy.ini.in
add configuration option which hides the instances tab in the main navigation

Conflicts:
	etc/adhocracy.ini.in
accompanying buildout branch for #90
local merge
Merge branch 'feature/120-show-more-markdown-extension' into develop
accompanying buildout commit to e39b8418c35ca166e2c71e86f63cfca8f6dc9652
upgrade jquery from 1.7.1 to 1.7.2
activate HHU buildout mirror