Fans of transactions now are happy
added checks to avoid instructions that break transactions
update jdoc
Merge pull request #36 from baasbox/master

pull request from repository baasbox, branch pushProfile
Merge pull request #37 from baasbox/master

pull request from repository baasbox
add new exception for handle the follow event: Push sent, but Google Cloud Messaging for Android is disabled
add IOException for GCMServer send
Merge pull request #492 from lupatellimatteo/master

add exception for push notifications
change description of push notifications settings
change description of exception
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
Merge pull request #59 from baasbox/master

update from origin master
added webservice bridge
Merge pull request #502 from giastfader/engine

first try to integrate ACE editor into the console
Merge branch 'engine' of github.com:baasbox/baasbox into engine
fixed regression on friendship
removed flaky test