Adding 'clear search' button to search fields
Adding 'clear search' button to input fields
Merge branch 'master' into gh-pages

Conflicts:
	src/js/controllers/CompanyListCtrl.js
	src/js/controllers/ContactListCtrl.js