Merge branch 'master' of https://github.com/GetRTI/getrti-ui

Conflicts:
	app/css/app.css
	app/index.html
UI changes for search

UI changes for search