ш
Merge branch 'master' of https://github.com/Tammind/dcapp

Conflicts:
	trunk/DCApp.v11.suo
Mappage design