Changed config and Style
Merge branch 'develop' into feature/search
Minor changes
Minor changes
Minor changes on search bundle.
Merge branch 'feature/search' into develop