Alpha .1
Merge remote-tracking branch 'origin/business-branch' into business-branch

Conflicts:
	lib/classes/SongManager.php
	lib/content/css/header.css
	lib/content/css/main.css
	lib/content/edit_group_form.php
	lib/content/template/template.php
	lib/content/view_group_basic.php
	loading.php
	wellspr_test.sql