Adding SongChoice (incorrectly) to admin app
Merge branch 'master' of https://github.com/robbbbbb/stickwm

Conflicts:
	collabdj/admin.py