Merge branch 'develop'
Merge branch 'master' of ssh://android-laithnurie.rhcloud.com/~/git/android