Merge pull request #1071 from ssushma/dev-branch

Standards Browse Option Implemented
Resolved conflits in message properties.
reverted maven version to 3.0
Merge pull request #1072 from anilgooru/dev-branch

Resolved conflits in message properties.
Sravanthi Changes for Add folders in search updated