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

Conflicts:
	Stuffbox/src/com/stuffbox/view/BadgeActivity.java