Small fixes to clientmodel and ClientProxy
(hopefully) finished DevCard Controller and Resource Controller
got rid of Cole's "hi"