diff --git a/LICENSE b/LICENSE
index 2ffff3d3..ff328e27 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
-Copyright © CyberAgent, Inc. All Rights Reserved.
+Copyright © 2013 CyberAgent, Inc.
+Copyright © 2016 The OpenSTF Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 20425746..d800c222 100644
--- a/README.md
+++ b/README.md
@@ -4,20 +4,33 @@
[](https://hub.docker.com/r/openstf/stf/)
[](https://www.npmjs.com/package/stf)
-[Help keep OpenSTF up to date and in active development!](https://salt.bountysource.com/teams/openstf)
-
**STF** (or Smartphone Test Farm) is a web application for debugging smartphones, smartwatches and other gadgets remotely, from the comfort of your browser.
-It is currently being used at [CyberAgent](https://www.cyberagent.co.jp/en/) to control a growing collection of more than 160 devices.
+STF was originally developed at [CyberAgent](https://www.cyberagent.co.jp/en/) to control a growing collection of more than 160 devices. As of July 2016 development is mainly sponsored by [HeadSpin](https://headspin.io/) and [other individual contributors](https://www.bountysource.com/teams/openstf).
+
+Please visit [our BountySource](https://salt.bountysource.com/teams/openstf) if you'd like to support future development. How are your donations being used? Check out our [donation transparency report](DONATION-TRANSPARENCY.md).
+## Sponsors
+
+### Gold Sponsor
+
+[
](https://headspin.io/)
+
+[HeadSpin](https://headspin.io/) offers a generous monthly contribution towards STF development. HeadSpin allows you to test and monitor your apps on cell networks around the globe without adding any code.
+
+### How to become a sponsor
+
+Please [contact us][contact-link] for sponsor arrangements. Both recurring and one-time contributions are most welcome. Contributions towards a specific issue or feature are also possible, and can be attributed to your company in our release notes and other related materials. Hardware-only contributions, whether new or used, are also extremely helpful and well received, especially if you find a device that doesn't work. Please see our [donation transparency report](DONATION-TRANSPARENCY.md) for past hardware contributions.
+
## Announcements
* Thanks to @qband, @juliusspencer and Anonymous donors, we've been able to confirm [Android N Preview 4 support!](https://github.com/openstf/stf/issues/279)
* We've added a [donation transparency report](DONATION-TRANSPARENCY.md) for all to see.
+* [HeadSpin](https://headspin.io/) is now sponsoring future development!
## Features
@@ -63,7 +76,7 @@ It is currently being used at [CyberAgent](https://www.cyberagent.co.jp/en/) to
## Status
-STF is in continued, active development, but as of late 2015 the team is operating mostly on their private time and funds. While normal for many open source projects, STF is quite heavy on the hardware side, and is therefore somewhat of a money sink. [Contact us][contact-link] if you'd like to support future development or even become our next sponsor.
+STF is in continued, active development, but development is still largely funded by individual team members and their unpaid free time, leading to slow progress. While normal for many open source projects, STF is quite heavy on the hardware side, and is therefore somewhat of a money sink. See [how to become a sponsor](#how-to-become-a-sponsor) if you or your company would like to support future development.
We're also actively working to expand the team. Welcome **@vbanthia** as our newest full contributor!
@@ -76,12 +89,6 @@ Here are some things we are planning to address ASAP.
3. Properly reset user data between uses (Android 4.0+)
4. Automated scheduled restarts for devices
-### Sponsors wanted
-
-Is your company (or you!) a heavy user of STF? Consider becoming a hardware sponsor. If you find a device that doesn't work, or would simply like to ensure support for a new model, [send it to us][contact-link]! While we can't guarantee a fix, we can promise that someone will take a detailed look into what's going on with your device, and fix it when possible. For difficult cases you may need to use our [consulting services](#consulting-services) instead.
-
-You can also sponsor a feature or bug fix and get it attributed to you or your company in the release notes.
-
### Consulting services
We highly encourage open participation in the community. However, if you're running a business that uses STF or would like to use STF, you may sometimes want to have an expert, i.e. one of the original developers or a skilled contributor, work with you to set up a prototype for evaluation purposes, add support for new or old hardware, figure out an issue, fix a bug or add some new feature. Our services are similar to [FFmpeg's](https://ffmpeg.org/consulting.html). [Contact us][contact-link] with details and we'll see what we can do.
@@ -415,6 +422,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
See [LICENSE](LICENSE).
-Copyright © CyberAgent, Inc. All Rights Reserved.
+Copyright © The OpenSTF Project. All Rights Reserved.
[contact-link]: mailto:contact@openstf.io
diff --git a/doc/sponsors/headspin-wordmark-orange.svg b/doc/sponsors/headspin-wordmark-orange.svg
new file mode 100644
index 00000000..52e3c59b
--- /dev/null
+++ b/doc/sponsors/headspin-wordmark-orange.svg
@@ -0,0 +1,64 @@
+
+
+
diff --git a/package.json b/package.json
index 4fc56aef..8f74bebd 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,9 @@
},
"license": "Apache-2.0",
"author": {
- "name": "CyberAgent, Inc.",
- "email": "npm@cyberagent.co.jp",
- "url": "http://www.cyberagent.co.jp/"
+ "name": "The OpenSTF Project",
+ "email": "contact@openstf.io",
+ "url": "https://openstf.io"
},
"repository": {
"type": "git",