Moving toward api for study
Switching to 'api' as the key for the test study, which is what is in the hostname
Removing conflict markers
Merge pull request #327 from alxdarksage/rename-test-study

Rename test study to api...
Upgrade PhatomJS to 1.9.8; Upgrade Play to 2.2.6
Merge branch 'update' of https://github.com/eric-wu/BridgePF into update