Secure API
Merge branch 'secure_api' of git://github.com/IDCI-Consulting/NotificationBundle into secure_api and fix conflict

Conflicts:
	Controller/ApiNotificationController.php
Rename type of notification from Camelcase to underscore