Merge remote-tracking branch 'origin/6.x-1.x' into 6.x-2.x

Signed-off-by: Mark Casias <markie@teampoop.com>

Conflicts:
	README.txt
	mp3player.install
	mp3player.module

because I can't seem to figure out git…