issueFixed
developBranch
develop -> branch 2
Merge branch 'branch2.1' of https://github.com/kbacalso/branching into branch2.1

Conflicts:
	branchExp/ViewController.m