Use cgi.escape instead of markupsafe.escape

We don't declare a dependency to markupsafe, so we shouldn't use it, especially when cgi.escape is in the stdlib.
Remove unused mako option

grep -r escape adhocracy/templates   doesn't find a single invocation of this method. Furthermore, we don't actually depend on markupsafe, so this has always worked by accident.
Remove otudated workaround. We now depend on sqlite >=0.7.9
Depend on cssselect for testbrowser
moved PasteScript to normal dependencies to stop it from appearing in the adhocracy source code directory

Conflicts:
	setup.py
Fix norm/proposal assignment with relative_urls

Addendum to e74eaf6b0f0bda02dd3a69ac2e0065c6071c6503
Show category in proposal information box
indent
Allow assignment of categories to pages

It is now possible to assign categories to pages. The categories to be
assigned are the same categories as the proposal categories, as these
CategoryBadges are DelegateableBadges anyway, and can thus be used for
pages as well.

This way these categories may act as another bridge between proposals
and pages. If this isn't always desired, additional attributes can be
added later to the CategoryBadge model in order to define, whether a
category is meant as a proposal category, a badge category or both.

This commit doesn't add category facets to the page listing.
show category description in dropdown list instead of title
Revert "Remove unused mako option"

This reverts commit 3c28ff454fc2209c2df18e94e5650da35ff86c10.

The `escape` isn't declared explicitly, as it was already a [default
filter](http://docs.makotemplates.org/en/latest/filtering.html#the-default-filters-argument),
used in *all* expression tags (except in those using `|n`).

MarkupSafe is pulled in as a dependency of Mako, which Adhocracy depends on, so
this hasn't only worked *by accident*.

Using `escape` from *MarkupSafe* is recommended in the [Pylons 1.0.1 upgrade
notes](http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/upgrading.html),
that's why I changed it in the corresponding commit
db63816f1f012d231a838077a314d55e6ba54114.
Default to the default buildout settings in test.ini
Merge remote-tracking branch 'origin/develop' into develop
Update Mako and add MarkupSafe dependencies in setup.py

See discussion in 3c28ff454fc2209c2df18e94e5650da35ff86c10
Remove already fixed FIXME

Addendum to actual fix commit 0b16c1524b401cdf6c577dd67b3631a520dc653e
fix paster index command usage hint
Fix user activity sorting

Query the solr fields which are actually stored: For the global user
list, this is `order.user.activity`, for instance user lists, this is
`order.user.activity.instance_key`.
Update user activity regularly

As the activity score isn't reevaluated on every user activity, this has
to be done on a regular base - now on a daily base, the same interval as
the instance listings.
fix typos
Add user rating algorithm and sorting (fixes #190)

An algorithm is created which sums ratings user receive for their
contributions. This currently simply adds up the score for user's
comments and the score for the user's proposals rate polls.

This score is added to the user documents in the solr index as separate
fields per instance, as it is done with user activity.

Consequently, the solr score can be used for rating based sorting of the
instance membership lists.