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

Conflicts:
	iStarosta.suo
	iStarosta/ContentForUser/CurrentMessage.aspx
1