Merge pull request #492 from lupatellimatteo/master

add exception for push notifications
Merge pull request #493 from lupatellimatteo/master

some modifications of push notifications settings
remove unnecessary description for password recovery
Merge pull request #495 from lupatellimatteo/push

remove unnecessary description for password recovery
Merge pull request #38 from baasbox/master

pull from repository baasbox