Still doing this manually while Idea is doing its best to screw everything up.
Merge branch 'master' of https://github.com/VlMazlov/fizteh-java2-2014

Conflicts:
	storage/module-api/pom.xml
	storage/module-core/pom.xml
	storage/module-main/pom.xml
	storage/module-presentation/pom.xml
	storage/module-shell/pom.xml
	storage/module-utils/pom.xml
	storage/pom.xml