Merge branch 'master' of https://github.com/OhadR/cft-calc--gae

Conflicts:
	cft_calc/src/test/java/com/ohadr/cftcalc/tests/InMemRepository.java
Merge branch 'master' of https://github.com/OhadR/cft-calc--gae