July 6, 2013
Merge branch 'master' of github.com:earphone/AndroidTestApp

Conflicts:
	README