fix merge conflicts
favorites
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
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
fixed welcome controller
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
cleaned up form fields
Cleaned up form fields Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
Attempts at favoriting
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
More and more and more and more stuff
mobile testing
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
Changes for favorites
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
merge
merge done
global type change
dashboard gymnastics