Merge branch 'master' into fragment_tests

Conflicts:
mplus-parallax-viewpager-client/build.gradle