UI Improvements, Search UI Implemented
UI Fix
Merge branch 'development' of https://github.com/OceanTechnologies/Ocean into development

Conflicts:
	Ocean.xcodeproj/project.xcworkspace/xcshareddata/Ocean.xccheckout
No Change