added cancellation feature
added IST locale by default
merging changes to preprod for testing

Merge branch 'refactoring' into preprod