Added support for android push notification
Merge commit '5927afdfe6816e450d4ff9d6ee09eeee0cba85cc' into 20140606-Quick-Fixes
submodule update
Merge branch '20140401-dev-stable' into feature-20140804-settings-fix