Merge branch 'master' of github.com:buddycloud/buddycloud-server-java
Merge branch 'delete-notifications' of github.com:surevine/buddycloud-server-java
Merge branch 'master' of github.com:buddycloud/buddycloud-server-java
Tabs -> spaces (as it should be)