Activity owner can now choose from some predefined values that will be collected from the participants during registration.
Improve the title of the regular edit dialog.
Merge branch 'master' into activity
Switched to new mixin inclusion style.
Activity can now tell whether an addOn edit link should be displayed.
Merge commit 'd85407dc4691289a09db2c50640bc9f8525aa887' into activity
AddOn configuration dialog is now equipped with csrf.
Added new configuration option "roommate"
First draft version of addOn information including persistence.
API for the loading of an AddOn information.
1st step for editing add-on information by user (currently works with jade 1.1.5 only - jade 1.2 must be fixed)
add-on feature refined
Merge branch 'master' into nicoleactivity
Introducing a mixin for the submit buttons.
Member edit form now also has buttons at the end.
Adding some space at the page bottom.
Merge pull request #623 from NicoleRauch/master

ui tweaks
configuring add ons now inside the activity edit form
Merge commit '300a61694d85467e2ab838bdcadcf8bb25216214' into nicoleactivity

Conflicts:
	lib/activities/views/edit.jade

renamed addOn.jade to addon1.jade (interim)
rename complete from addOn to add-on