Renamed user/search to user/simple_search
Changed back the button layout
Merge branch 'feature/catalyst-admin' of https://github.com/inverse-inc/packetfence into feature/catalyst-admin