bug fixed
Merge branch 'Card-UI' of github.com:ninjaatif/idealab_client into dev