Fix campaigns dashboard missing method bug
Refactoring Conference Basics #384
Extracting Photos form Conference edit form
close #384
Added Subscription model to send emails
Subscription on Registration, Independent Subscription without registration
Removed brand helper for consistency, replaced glyphicons with fontawesome icons
Moving notifications to models
Merge pull request #437 from ChrisBr/refactor_basic_menu

Refactor basic menu
Switch to apache init restart as passenger's tmp/restart.txt seem not to be reliable :-/
Merge pull request #440 from gopesht/add_home_route_to_splash

Added route to root path for navigation from splash
Merge pull request #377 from gopesht/add_email_settings_to_user_accounts

Add email settings to user accounts
Merge pull request #443 from hennevogel/master

Switch to apache init restart
Implement role authorization
fix conflicts
fix style
fix style
fix style
fix
fix
fix in questions