Wrong return type

(thanks Xcode 5!)
Adding dependencies to Functional Test scheme
Xcode 5 recommended changes
Reverting project changes
Checkpoint
Merge branch 'develop' into feature/repo-refactor

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Comments
QueueGroups start suspended
Forgot to add
Removing dead code
Initializing taskManager
Restoring reachability tracking and improving block selfyness
Fixing bug with waiting for initialization
Merge branch 'feature/repo-refactor' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'develop' into timer_fixes

Conflicts:
	Zinc/ZincRepo.m