PJF6
Merge remote-tracking branch 'origin/master'

Conflicts:
	CommYouNity/Web.config
Merge branch 'master' of https://github.com/odil-akhmedov/CommYouNity