Update for Gradle 2.2
Update for Gradle 2.2 - use APPLICATION_ID
Fix Lollipop SMS READ_PHONE_STATE permission issue
Don't shortcut if statement
Bump version for v3.1
Merge branch 'release/v3.1' into develop