Add ticking
Add ticking
Merge remote-tracking branch 'origin/master'

Conflicts:
	service/src/main/java/org/kofi/creditex/service/CreditCalculator.java