Fix commit 3475638:  translation weren't generated in Jed format...
vote widget integration: add a link to configure the widget instance in the idea panel
small optimization
make sure we're using the right db
example new field in discussion
add context page
change context page holder div
ignore virtuoso, db backups, src...
add an admin panel to edit some discussion fields
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl into marionette
Replaced localization with develop branch.

Conflicts:
	assembl/templates/views/ideaPanel.tmpl
Merge branch 'marionette' of https://github.com/ImaginationForPeople/assembl into marionnette_wip