db merge stuff
Merge branch 'master' of github.com:mgm1992/Dim
Merge branch 'master' of github.com:mgm1992/Dim

Conflicts:
	SocialStalker/socialStalker/views.pyc
Merge branch 'master' of github.com:mgm1992/Dim
Sorting more merge conflicts