tst
Merge branch 'master' of https://github.com/UTASoftwareEngineering2014/android_sample

Conflicts:
	.metadata/.log