Merged changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	abfgp-2.f/settings/abgp.py