Merge branch 'develop'
update to UA Android SDK 3.1.0
Merge branch 'develop'
Merge branch 'master' of git://github.com/goodgravy/trigger.io-ua-push into goodgravy-pull2
Merge branch 'master' into develop