Merge remote-tracking branch 'origin/master'

Conflicts:
	EduShop-Unsecure/EduShop-Unsecure.v12.suo