Merge branch 'develop' into AfterExtra
update test to robolectrict 2.x
Specify android build-tools in .travis.yml

From July 2014 it is necessary to specify which build-tools version should
be used when building an Android project with Travis CI.

http://docs.travis-ci.com/user/languages/android/
Merge pull request #1090 from JessThrysoee/android-build-tools

Specify android build-tools in .travis.yml
Merge branch 'AfterExtra' into mysnap
Merge branch 'develop' into mysnap