Remove fanstatic_url helper
Surprisingly, removing this chunk of code has no effect. I could not find any usage of fanstatic_url, tests pass, and everything looks as before
Upgrade SQLAlchemy (0.7.9 -> 0.7.10)
Use secure login cookies on SSL connections (fixes #210, part 1)
Strip dash from frontpage title (Port of https://github.com/hhucn/adhocracy.hhu_theme/issues/117 )
Make stats on homepage configurable (https://github.com/hhucn/adhocracy.hhu_theme/issues/118)
Add referer to requestlog (Closes https://github.com/hhucn/adhocracy.hhu_theme/issues/126 )
requestlog: Re-add default value for accesstime, and correct migration
moved adhocracy package to src/adhocracy (use git log --follow filename to list the old history)

Conflicts:
	adhocracy/templates/admin/import_form.html
	adhocracy/templates/admin/userimport_form.html
	setup.py
	src/adhocracy/controllers/geo.py
	src/adhocracy/lib/geo.py
	src/adhocracy/lib/helpers/counter.py
	src/adhocracy/migration/versions/045_add_region_table.py
	src/adhocracy/migration/versions/046_add_proposal_geotag_column.py
	src/adhocracy/migration/versions/047_add_region_hierarchy_table.py
	src/adhocracy/migration/versions/048_add_region_simplified_table.py
	src/adhocracy/migration/versions/049_add_instance_geo_center.py
	src/adhocracy/migration/versions/050_increase_maximal_instance_key_size.py
	src/adhocracy/migration/versions/051_add_page_geotag_column.py
	src/adhocracy/model/region.py
	src/adhocracy/static/images/bullet.png
	src/adhocracy/static/images/close-top-right.png
	src/adhocracy/static/images/easteregg-2012/Chick_008_Newborn_Egg_Cartoon_chocolate.png
	src/adhocracy/static/images/easteregg-2012/easter01.png
	src/adhocracy/static/images/easteregg-2012/easter02.png
	src/adhocracy/static/images/easteregg-2012/easter03.png
	src/adhocracy/static/images/easteregg-2012/nicubunu_Easter_eggs.png
	src/adhocracy/static/images/map_hall_green.png
	src/adhocracy/static/images/map_hall_grey.png
	src/adhocracy/static/images/map_hall_pink.png
	src/adhocracy/static/images/map_hall_pink_a.png
	src/adhocracy/static/images/map_hall_pink_b.png
	src/adhocracy/static/images/map_hall_pink_c.png
	src/adhocracy/static/images/map_hall_pink_d.png
	src/adhocracy/static/images/map_hall_pink_e.png
	src/adhocracy/static/images/map_hall_pink_f.png
	src/adhocracy/static/images/map_hall_pink_g.png
	src/adhocracy/static/images/map_hall_pink_h.png
	src/adhocracy/static/images/map_hall_pink_i.png
	src/adhocracy/static/images/map_hall_pink_j.png
	src/adhocracy/static/images/map_halls_pink_a_j.png
	src/adhocracy/static/images/map_marker_pink.png
	src/adhocracy/static/images/map_marker_pink_a.png
	src/adhocracy/static/images/map_marker_pink_b.png
	src/adhocracy/static/images/map_marker_pink_c.png
	src/adhocracy/static/images/map_marker_pink_d.png
	src/adhocracy/static/images/map_marker_pink_e.png
	src/adhocracy/static/images/map_marker_pink_f.png
	src/adhocracy/static/images/map_marker_pink_g.png
	src/adhocracy/static/images/map_marker_pink_h.png
	src/adhocracy/static/images/map_marker_pink_i.png
	src/adhocracy/static/images/map_marker_pink_j.png
	src/adhocracy/static/images/map_markers_pink_a_j.png
	src/adhocracy/static/images/map_resize_full.png
	src/adhocracy/static/images/map_resize_full_exit.png
	src/adhocracy/static/images/map_resize_rec_minus.png
	src/adhocracy/static/images/map_resize_rec_plus.png
	src/adhocracy/static/images/map_resize_tri_plus.png
	src/adhocracy/static/images/open-arrow-right.png
	src/adhocracy/static/images/townhall-64-green-a.png
	src/adhocracy/static/images/townhall-64-green-b.png
	src/adhocracy/static/images/townhall-64-green-c.png
	src/adhocracy/static/images/townhall-64-green-d.png
	src/adhocracy/static/images/townhall-64-green-e.png
	src/adhocracy/static/images/townhall-64-green-f.png
	src/adhocracy/static/images/townhall-64-green-g.png
	src/adhocracy/static/images/townhall-64-green-h.png
	src/adhocracy/static/images/townhall-64-green-i.png
	src/adhocracy/static/images/townhall-64-green-j.png
	src/adhocracy/static/images/townhall-64-green.png
	src/adhocracy/static/images/townhall-64-grey-a.png
	src/adhocracy/static/images/townhall-64-grey-b.png
	src/adhocracy/static/images/townhall-64-grey-c.png
	src/adhocracy/static/images/townhall-64-grey-d.png
	src/adhocracy/static/images/townhall-64-grey-e.png
	src/adhocracy/static/images/townhall-64-grey-f.png
	src/adhocracy/static/images/townhall-64-grey-g.png
	src/adhocracy/static/images/townhall-64-grey-h.png
	src/adhocracy/static/images/townhall-64-grey-i.png
	src/adhocracy/static/images/townhall-64-grey-j.png
	src/adhocracy/static/images/townhall-64-grey.png
	src/adhocracy/static/images/townhall-64-lightgreen-a.png
	src/adhocracy/static/images/townhall-64-lightgreen-b.png
	src/adhocracy/static/images/townhall-64-lightgreen-c.png
	src/adhocracy/static/images/townhall-64-lightgreen-d.png
	src/adhocracy/static/images/townhall-64-lightgreen-e.png
	src/adhocracy/static/images/townhall-64-lightgreen-f.png
	src/adhocracy/static/images/townhall-64-lightgreen-g.png
	src/adhocracy/static/images/townhall-64-lightgreen-h.png
	src/adhocracy/static/images/townhall-64-lightgreen-i.png
	src/adhocracy/static/images/townhall-64-lightgreen-j.png
	src/adhocracy/static/images/townhall-64-lightgreen.png
	src/adhocracy/static/images/townhall-64-red-a.png
	src/adhocracy/static/images/townhall-64-red-b.png
	src/adhocracy/static/images/townhall-64-red-c.png
	src/adhocracy/static/images/townhall-64-red-d.png
	src/adhocracy/static/images/townhall-64-red-e.png
	src/adhocracy/static/images/townhall-64-red-f.png
	src/adhocracy/static/images/townhall-64-red-g.png
	src/adhocracy/static/images/townhall-64-red-h.png
	src/adhocracy/static/images/townhall-64-red-i.png
	src/adhocracy/static/images/townhall-64-red-j.png
	src/adhocracy/static/images/townhall-64-red.png
	src/adhocracy/static/images/transparent.png
	src/adhocracy/static/images/ui-anim_basic_16x16.gif
	src/adhocracy/static/javascripts/adhocracy.geo.i18n-de.js
	src/adhocracy/static/javascripts/adhocracy.geo.i18n-en.js
	src/adhocracy/static/javascripts/adhocracy.geo.i18n-fr.js
	src/adhocracy/static/javascripts/adhocracy.geo.i18n-nl.js
	src/adhocracy/static/javascripts/adhocracy.geo.i18n-pl.js
	src/adhocracy/static/javascripts/adhocracy.geo.i18n-ro.js
	src/adhocracy/static/javascripts/adhocracy.geo.i18n-ru.js
	src/adhocracy/static/javascripts/adhocracy.geo.js
	src/adhocracy/static/javascripts/easteregg.json
	src/adhocracy/static/javascripts/jquery-1.7.1.min.js
	src/adhocracy/static/javascripts/jquery.i18n.js
	src/adhocracy/static/javascripts/jquery.i18n.min.js
	src/adhocracy/static/jqueryui/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	src/adhocracy/static/jqueryui/images/ui-bg_diagonals-thick_20_666666_40x40.png
	src/adhocracy/static/jqueryui/images/ui-bg_flat_10_000000_40x100.png
	src/adhocracy/static/jqueryui/images/ui-bg_glass_100_f6f6f6_1x400.png
	src/adhocracy/static/jqueryui/images/ui-bg_glass_100_fdf5ce_1x400.png
	src/adhocracy/static/jqueryui/images/ui-bg_glass_65_ffffff_1x400.png
	src/adhocracy/static/jqueryui/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	src/adhocracy/static/jqueryui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	src/adhocracy/static/jqueryui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	src/adhocracy/static/jqueryui/images/ui-icons_222222_256x240.png
	src/adhocracy/static/jqueryui/images/ui-icons_228ef1_256x240.png
	src/adhocracy/static/jqueryui/images/ui-icons_ef8c08_256x240.png
	src/adhocracy/static/jqueryui/images/ui-icons_ffd27a_256x240.png
	src/adhocracy/static/jqueryui/images/ui-icons_ffffff_256x240.png
	src/adhocracy/static/jqueryui/jquery-ui.custom.css
	src/adhocracy/static/jqueryui/jquery-ui.custom.min.js
	src/adhocracy/static/openlayers-editor/examples/editor.html
	src/adhocracy/static/openlayers-editor/examples/ole.min.js
	src/adhocracy/static/openlayers-editor/examples/wfs.html
	src/adhocracy/static/openlayers-editor/lib/Editor.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/CADTools.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/CleanFeature.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/DeleteFeature.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/Dialog.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/DragFeature.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/DrawHole.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/DrawPath.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/DrawPoint.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/DrawPolygon.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/EditorPanel.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/FixedAngleDrawing.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/ImportFeature.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/LayerSettings.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/MergeFeature.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/ParallelDrawing.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/SnappingSettings.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/SplitFeature.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/TransformFeature.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Control/UndoRedo.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Lang/ca.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Lang/de.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Lang/en.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Lang/hu.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Layer.js
	src/adhocracy/static/openlayers-editor/lib/Editor/Layer/Snapping.js
	src/adhocracy/static/openlayers-editor/lib/externs.js
	src/adhocracy/static/openlayers-editor/lib/loader.js
	src/adhocracy/static/openlayers-editor/ole.min.js
	src/adhocracy/static/openlayers-editor/tests/Control/testCleanFeature.js
	src/adhocracy/static/openlayers-editor/tests/Control/testDeleteFeature.js
	src/adhocracy/static/openlayers-editor/tests/Control/testDrawHole.js
	src/adhocracy/static/openlayers-editor/tests/Control/testDrawPolygon.js
	src/adhocracy/static/openlayers-editor/tests/Control/testEditorPanel.js
	src/adhocracy/static/openlayers-editor/tests/Control/testImportFeature.js
	src/adhocracy/static/openlayers-editor/tests/Control/testLayerSettings.js
	src/adhocracy/static/openlayers-editor/tests/Control/testTransformFeature.js
	src/adhocracy/static/openlayers-editor/tests/index.html
	src/adhocracy/static/openlayers-editor/tests/qunit.css
	src/adhocracy/static/openlayers-editor/tests/qunit.js
	src/adhocracy/static/openlayers-editor/tests/test.js
	src/adhocracy/static/openlayers-editor/tests/testEditor.js
	src/adhocracy/static/openlayers-editor/theme/geosilk/geosilk.css
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/bg-map.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/cadTools.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/cleanFeature.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/deleteFeature.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/dragFeature.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/drawHole.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/drawLine.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/drawPath.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/drawPoint.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/drawPolygon.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/guidedDrawing.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/importFeature.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/mergeFeature.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/modifyFeature.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/navigation.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/parallelDrawing.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/rotationHandle.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/selectFeature.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/snappingActive.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/snappingInactive.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/splitFeature.png
	src/adhocracy/static/openlayers-editor/theme/geosilk/img/transformFeature.png
	src/adhocracy/static/openlayers/img/blank.gif
	src/adhocracy/static/openlayers/img/cloud-popup-relative.png
	src/adhocracy/static/openlayers/img/drag-rectangle-off.png
	src/adhocracy/static/openlayers/img/drag-rectangle-on.png
	src/adhocracy/static/openlayers/img/east-mini.png
	src/adhocracy/static/openlayers/img/layer-switcher-maximize.png
	src/adhocracy/static/openlayers/img/layer-switcher-minimize.png
	src/adhocracy/static/openlayers/img/marker-blue.png
	src/adhocracy/static/openlayers/img/marker-gold.png
	src/adhocracy/static/openlayers/img/marker-green.png
	src/adhocracy/static/openlayers/img/marker.png
	src/adhocracy/static/openlayers/img/measuring-stick-off.png
	src/adhocracy/static/openlayers/img/measuring-stick-on.png
	src/adhocracy/static/openlayers/img/north-mini.png
	src/adhocracy/static/openlayers/img/panning-hand-off.png
	src/adhocracy/static/openlayers/img/panning-hand-on.png
	src/adhocracy/static/openlayers/img/slider.png
	src/adhocracy/static/openlayers/img/south-mini.png
	src/adhocracy/static/openlayers/img/west-mini.png
	src/adhocracy/static/openlayers/img/zoom-minus-mini.png
	src/adhocracy/static/openlayers/img/zoom-plus-mini.png
	src/adhocracy/static/openlayers/img/zoom-world-mini.png
	src/adhocracy/static/openlayers/img/zoombar.png
	src/adhocracy/static/openlayers/la
	src/adhocracy/static/openlayers/lu
	src/adhocracy/static/openlayers/openlayers.js
	src/adhocracy/static/openlayers/openlayers.min.js
	src/adhocracy/static/openlayers/theme/default/google.css
	src/adhocracy/static/openlayers/theme/default/google.tidy.css
	src/adhocracy/static/openlayers/theme/default/ie6-style.css
	src/adhocracy/static/openlayers/theme/default/ie6-style.tidy.css
	src/adhocracy/static/openlayers/theme/default/img/add_point_off.png
	src/adhocracy/static/openlayers/theme/default/img/add_point_on.png
	src/adhocracy/static/openlayers/theme/default/img/blank.gif
	src/adhocracy/static/openlayers/theme/default/img/close.gif
	src/adhocracy/static/openlayers/theme/default/img/drag-rectangle-off.png
	src/adhocracy/static/openlayers/theme/default/img/drag-rectangle-on.png
	src/adhocracy/static/openlayers/theme/default/img/draw_line_off.png
	src/adhocracy/static/openlayers/theme/default/img/draw_line_on.png
	src/adhocracy/static/openlayers/theme/default/img/draw_point_off.png
	src/adhocracy/static/openlayers/theme/default/img/draw_point_on.png
	src/adhocracy/static/openlayers/theme/default/img/draw_polygon_off.png
	src/adhocracy/static/openlayers/theme/default/img/draw_polygon_on.png
	src/adhocracy/static/openlayers/theme/default/img/editing_tool_bar.png
	src/adhocracy/static/openlayers/theme/default/img/move_feature_off.png
	src/adhocracy/static/openlayers/theme/default/img/move_feature_on.png
	src/adhocracy/static/openlayers/theme/default/img/navigation_history.png
	src/adhocracy/static/openlayers/theme/default/img/overview_replacement.gif
	src/adhocracy/static/openlayers/theme/default/img/pan-panel-NOALPHA.png
	src/adhocracy/static/openlayers/theme/default/img/pan-panel.png
	src/adhocracy/static/openlayers/theme/default/img/pan_off.png
	src/adhocracy/static/openlayers/theme/default/img/pan_on.png
	src/adhocracy/static/openlayers/theme/default/img/panning-hand-off.png
	src/adhocracy/static/openlayers/theme/default/img/panning-hand-on.png
	src/adhocracy/static/openlayers/theme/default/img/remove_point_off.png
	src/adhocracy/static/openlayers/theme/default/img/remove_point_on.png
	src/adhocracy/static/openlayers/theme/default/img/ruler.png
	src/adhocracy/static/openlayers/theme/default/img/save_features_off.png
	src/adhocracy/static/openlayers/theme/default/img/save_features_on.png
	src/adhocracy/static/openlayers/theme/default/img/view_next_off.png
	src/adhocracy/static/openlayers/theme/default/img/view_next_on.png
	src/adhocracy/static/openlayers/theme/default/img/view_previous_off.png
	src/adhocracy/static/openlayers/theme/default/img/view_previous_on.png
	src/adhocracy/static/openlayers/theme/default/img/zoom-panel-NOALPHA.png
	src/adhocracy/static/openlayers/theme/default/img/zoom-panel.png
	src/adhocracy/static/openlayers/theme/default/style.css
	src/adhocracy/static/openlayers/theme/default/style.mobile.css
	src/adhocracy/static/openlayers/theme/default/style.mobile.tidy.css
	src/adhocracy/static/openlayers/theme/default/style.tidy.css
	src/adhocracy/static/stylesheets/adhocracy.geo.css
	src/adhocracy/static_src/map_hall_pink.svg
	src/adhocracy/static_src/map_hall_pink_a_j.xcf.bz2
	src/adhocracy/static_src/map_marker_pink.svg
	src/adhocracy/static_src/map_markers_pink_a_j.png
	src/adhocracy/static_src/map_markers_pink_a_j.xcf.bz2
	src/adhocracy/static_src/map_resize_full.xcf
	src/adhocracy/static_src/map_resize_full_exit.xcf
	src/adhocracy/static_src/openlayers-adhocracy.cfg
	src/adhocracy/templates/admin/import_form.html
	src/adhocracy/templates/geo/map.html
	src/adhocracy/templates/page/edit_geotag.html
	src/adhocracy/templates/proposal/edit_geotag.html
	src/adhocracy/templates/proposal/index_map.html

move remaining files to src
copied buildout files to install adhcoracy

updated .gitignore

Conflicts:
	.gitignore

make buildout work

added versions.cfg

Fix ImportError: No module named genshi.template

fix: sphinx doc generation is not working

updated bootstrap.py
moved test.ini, development.ini, schema.xml to etc

Conflicts:
	adhocracy/lib/cli.py
	docs/development/tests.rst

Conflicts:
	src/adhocracy/lib/cli.py

moved schema.xml to etc/solr_schema.xml

Conflicts:
	src/adhocracy/lib/cli.py
removed development.ini

Conflicts:
	etc/test.ini

remove development.ini (cleanup bad rebase)
added installation instactions

updated doc: no virtualenv, paster setup-app needed
removed branch option
use buildout:bin-directory
added include-site-packages = false option, to make the installation work without virtualenv
use buildout:parts-directory
auto-generate the session secret hash
updated Paste* to make it work with shapely
moved PasteScript to normal dependencies to stop it from appearing in the adhocracy source code directory

Conflicts:
	setup.py
updated Cython; make Cython/Shapely work without virutal_env