commands and jsps
Merge branch 'master' of git@github.com:Faustyachka/Zephyrus.git

Conflicts:
	src/com/zephyrus/wind/managers/CommandManager.java