updated OPrime for new couchbase branding
Merge pull request #13 from ChildPhonologyLabMcGill/master

bringing in changes from mcgill repo
Merge branch 'master' of git://github.com/jdhorner/OPrime into jdhorner-master

Resolved merge conflicts which were basically due to comments

Conflicts:
	OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/activity/HTML5ReplicatingActivity.java
Merge branch 'master' of github.com:iLanguage/OPrime