use compileSdkVersion 19
Merge branch 'develop' into feature/travis-integration