Edited common.txt.
Merge branch 'master' into b

Conflicts:
	common.txt