cleared out some unused variables, fixed a couple of signatures in header files.
Merge branches 'master' and 'master' of https://github.com/TBITracker/taskplanner
Working toward a better step view world
Merge branch 'master' into stepviewmultistate

# By ssaltzman (5) and others
# Via lmd59 (1) and ssaltzman (1)
* master:
  Change to alert box so that it prompts for step title when creating a step (instead of task title)
  Resolve alert prompt text box issue for ios7
  Update TBITaskTimelineView.m
  removed view outlines; fixed signature for updateTimelineViewAnimated
  Fixed error with scrollview when editing leftmost step
  Fixed for real this time wow
  Fixed one line and not the line immediately before it because durp
  Fix to calendar highlighting
  Debugging some stuff
  Fixed the done button's magical disappearing act on edit step contents.

Conflicts:
	TBITaskPlanner/TBIStepView.m
	TBITaskPlanner/TBITaskTimelineView.m
Added .orig files to .gitignore
Merge branch 'master' into stepviewmultistate

# By Kaye, Lindsay M
# Via Kaye, Lindsay M
* master:
  Fixed top bar being SO BIG.  Now just shows status bar.
Merge branch 'master' into stepviewmultistate

# By Daniel Mauer (1) and Kaye, Lindsay M (1)
# Via Kaye, Lindsay M
* master:
  Removed extra back button but now there's a back button missing but I had to push so the code signing stuff was right.
  add .orig to gitignore
Added cocoa pods
Enabled DCIntrospect
add Pods user data to ignore list
removed some files that shouldn't be tracked
Merge branch 'master' into stepviewmultistate

# By Kaye, Lindsay M (4) and others
# Via Shepard Saltzman (4) and Kaye, Lindsay M (1)
* master:
  Label updates.
  Improved fetching, added method for turning TBILoggerEventTypes into NSStrings.
  Dante's fixes - propagated logging statements, fixed grey bar
  removed IBOutlet attribute from startButton
  back (cancel) button added to scheduler
  added stub for execute task capability
  Fixed error resulting from date comparison sorting.
  initialize TBIImagesView thumbnail images while setting context
  Fixed GetDurationWithMinutes. Played around with LoggerEvents.
  Calendar pop out looks a little less hideous
  Fixed calendar a little bit, still doesn't look great though.
  Add Pods userdata to ignore list
  no message
  Added cocoa pods & DCIntrospect
  Reset where start button is on task detail page.

Conflicts:
	.gitignore
	Podfile
	Pods/Pods.xcodeproj/project.pbxproj
	TBITaskPlanner.xcodeproj/project.pbxproj
	TBITaskPlanner.xcworkspace/xcshareddata/TBITaskPlanner.xccheckout
	TBITaskPlanner/TBIAppDelegate.m
	TBITaskPlanner/TBISlideshow.storyboard
	TBITaskPlanner/TBITaskTimelineView.m
Various fixes to new timeline structure
Stopped tracking xcuserdata
Merge branch 'stepviewmultistate'

* stepviewmultistate:
  Various fixes to new timeline structure
  removed some files that shouldn't be tracked
  add Pods user data to ignore list
  Enabled DCIntrospect
  Added cocoa pods
  Added .orig files to .gitignore
  Working toward a better step view world
  cleared out some unused variables, fixed a couple of signatures in header files.