Some logging stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	khanavali/src/main/java/com/khanavali/util/PropertiesAcessor.java