setup form changed
Merge branch 'master' of https://github.com/sinkerplus/Actually

Conflicts:
	media/css/sb-admin-2.css