MainActivity
Merge branch 'master' of https://github.com/deje88/stuffbox

Conflicts:
	Stuffbox/src/com/stuffbox/MainActivity.java