fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Calculator/src/main/java/com/barabashkastuff/pzks/calculator/domain/Expression.java
	Calculator/src/main/resources/META-INF/spring/spring-context.xml
some checks