some srange git isues...

Conflicts:
	share-a-flat/src/main/webapp/pages/search-list.jsp