change in master
Merge branch 'master' into lanc

Conflicts:
	7. Social/NEW/INSERT ALL SOCIAL.sql