fix merge conflicts
add a clientshowpage layoutfile less the nav partial called in the client controller
Fix merege conflictsMerge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev