Final commit by amsonmal,okdalvi,apnair
Merge branch 'aoa' of https://github.com/animate8/expertiza into e819
Closes #364