1221
Merge branch 'master' of https://github.com/dimayurkovski/iStarosta

Conflicts:
	iStarosta/ContentForModerator/EditNews.aspx
Merge branch 'master' of https://github.com/dimayurkovski/iStarosta
Merge branch 'master' of https://github.com/dimayurkovski/iStarosta
Subjects page