Merge pull request #3 from lmene024/arugg003

Arugg003
added email to user entity
Added Delete option to Manager
Added custom Scroll View subclass - (not working properly)
minor edit to xib files
Merge pull request #4 from lmene024/lmene024

Lmene024
fixed text view keyboard close
Merge remote-tracking branch 'origin/arugg003'

Conflicts:
	CartTracker/CartTracker.xcodeproj/project.pbxproj
	CartTracker/CartTracker/CTADetailViewController.h
	CartTracker/CartTracker/CTADetailViewController.m
	CartTracker/CartTracker/CTCartDetailViewController.xib
	CartTracker/CartTracker/CTScrollView.h
	CartTracker/CartTracker/CTScrollView.m
	CartTracker/CartTracker/CTUserDetailViewController.xib
Merge remote-tracking branch 'origin/arugg003'
Added calendarView and custom cell
Merge branch 'lmene024'

Conflicts:
	CartTracker/CartTracker.xcodeproj/project.pbxproj
	CartTracker/CartTracker/CTDataListViewController.m
manually merged some files
Merge branch 'lmene024'

Conflicts:
	CartTracker/CartTracker.xcodeproj/project.pbxproj
cleaned up commit errors
User detail working properly, added delete functionality,
user admin broken, some layout to fix
Merge remote-tracking branch 'origin/master'
Tried searchBar in Users and Carts but too complicated because the DataListViewController is fairly complex