q
Merge branch 'master' of https://github.com/maxslon/mamba.git

Conflicts:
	src/ru/mamba/fw/ApplicationManager.java
q