Merge branch 'beta'

Author: Josh Deffibaugh

.idea/copyright/Optimizely.xml

@@ -5,6 +5,7 @@ android:
     - platform-tools
     - build-tools-24.0.3
     - android-24
+    - doc-24
     - extra-android-m2repository
     - sys-img-armeabi-v7a-android-24
 jdk:
@@ -22,4 +23,4 @@ before_script:
   - adb shell input keyevent 82 &
 script:
   - ./gradlew testAllModules
-  - if [ "$TRAVIS_BRANCH" == "beta" ] || [ "$TRAVIS_BRANCH" == "master" ]; then ./gradlew ship; fi
+  - if [[ ( "$TRAVIS_BRANCH" == "beta"  || "$TRAVIS_BRANCH" == "master" ) && ( -z "$TRAVIS_TAG") ]]; then ./gradlew ship; fi

.idea/copyright/profiles_settings.xml

@@ -4,4 +4,8 @@
 
 We welcome contributions and feedback! All contributors must sign our [Contributor License Agreement (CLA)](https://docs.google.com/a/optimizely.com/forms/d/e/1FAIpQLSf9cbouWptIpMgukAKZZOIAhafvjFCV8hS00XJLWQnWDFtwtA/viewform) to be eligible to contribute.
 
-Simply create a branch off of `master`.  When the work on the branch is complete make a pull request.
+Simply create a branch off of `master`.  When the work on the branch is complete make a pull request.  Pull requests should be squashed and merged into `devel`.
+
+All branches will be built and run against the entire test suite on Travis with every commit.  
+
+The `test-app` module is built against a real Optimizely project.  Changing the project ID will cause tests to fail.  The test app should be used as a reference.