Carry over from master - 7/31/2014
Upgraded search feature
Versioning