Merge branch 'master' into functional-update

Conflicts:
	src/test/java/us/physion/ovation/integration/ExperimentInsertionTest.java
	src/test/java/us/physion/ovation/integration/GroupCreationTest.java
Merge remote-tracking branch 'origin/master'