dsc+
Merge branch 'master' of https://github.com/dgarkavenko/lj-game

Conflicts:
	bin/swfbuilds/config.txt