merge
Merge branch 'master' of http://github.com/ib2013/chat2push-android