Pull request
Merge remote-tracking branch 'ben/master'

Conflicts:
	Example/CHANGELOG.txt
	Example/LICENSE
	Example/LICENSE.txt
	Example/README
	Example/manifest
	Example/tiapp.xml
adding my version
Merge pull request #3 from rborn/master

One more try