Revert "test"

This reverts commit 504978844dcbbee1dea9f1cdea72ae1994771a47.

Conflicts:
	AndroidTEST/res/layout/activity_main.xml