#1 nah...
Merge remote-tracking branch 'origin/master'

Conflicts:
	myallblue/dev.db
	myallblue/myallblue/settings.py
	myallblue/myallblue/urls.py