modified parse in backbone collection and model to handle http://labs.omniti.com/labs/jsend response formats
Merge branch 'master' of github.com:csgadmin/admin

deleted a file in github and didn't pull before working