Orgniaze pom.xml

Conflicts:
	pom.xml
Extract tests from agdroid