customer_search

Last functional changes committed in Feb 18 2013.
This commit has no functional changes, only resolving git conflicts