It's getting harder to track changes
Merge branch 'master' of https://github.com/ithillel/Xipiv.git

Conflicts:
	Xipiv/src/org/hillel/it/xipiv/persistence/repository/TestRepo.java
	Xipiv/src/org/hillel/it/xipiv/persistence/repository/impl/InMemoryTestRepo.java
Merge branch 'master' of https://github.com/ithillel/Xipiv.git
o/