Starting test framework
update readme
Merge branch 'master' of z:/android/sbt

Conflicts:
	README.md