cleanup old clientfactory references
Merge branch 'uibinder' of https://github.com/480Oswego2013/CSC-HCI-480-2013-repo into uibinder