added property file for IR, updated persistance
Merge remote-tracking branch 'upstream/master'