Little upd
Merge remote-tracking branch 'origin/master'

Conflicts:
	App_GlobalResources/ApplicationInfo.Designer.cs