test
Merge branch 'master' of https://github.com/drafenger/drafenger.git

Conflicts:
	Drafenger/src/com/drafenger/MainActivity.java