player
Merge remote-tracking branch 'origin/v3' into v3

Conflicts:
	Vibes/src/test/java/com/stiggpwnz/vibes/activities/MainActivityTest.java