merge purchasing
Update setup.md
Update setup.md
Add example of touchpad vs analog joystick detection
Update README.md

Added a link to Brazilian Portuguese translations of the docs
Merge pull request #10 from error454/controller_updates

Controller updates
Update docs for intent & image size changes.
Update docs:

-add test mode info
-fix capitalization of variable name
added Eclipse project import instructions
Merge branch 'master' of github.com:neontv/docs
Just a couple grammar/spelling fixes.
Merge pull request #13 from Renanse/patch-1

Just a couple grammar/spelling fixes.
[NEON-711] Add proguard information to docs
Fixed markdown
Merge branch 'unreleased' of github.com:neontv/docs [reviewed by Buddy]

Conflicts:
	purchasing.md
Merge branch 'master' of github.com:ouya/docs

Conflicts:
	purchasing.md
	setup.md
Update purchasing.md
Updated intent names
Merge branch 'master' of github.com:ouya/docs

Conflicts:
	setup.md
Update docs with OuyaController.init() info