DECUPAS-15
DECUPAS-15
Merge branch 'feature/culturefeed_uitpas_DECUPAS-13' into feature/culturefeed_uitpas_DECUPAS-15
Merge branch 'feature/culturefeed_uitpas_DECUPAS-15' of github.com:cultuurnet/culturefeed into feature/culturefeed_uitpas_DECUPAS-15
DECUPAS-15 config settings
DECUPAS-15 code clean up
DECUPAS-15 correct hook implementation
Merge branch 'master' into feature/culturefeed_uitpas_DECUPAS-15
DECUPAS-15 workaround
DECUPAS-15
DECUPAS-15: Ensure changing the title variable of the registration confirmation page does not require a menu rebuild
Merge branch 'feature/culturefeed_uitpas_DECUPAS-15' into feature/culturefeed_uitpas

Conflicts:
	culturefeed_uitpas/culturefeed_uitpas.admin.inc
	culturefeed_uitpas/culturefeed_uitpas.menu.inc
	culturefeed_uitpas/culturefeed_uitpas.module
	culturefeed_uitpas/includes/registration_confirmation.inc