fixed
Merge branch 'ab-fix-disbug'

Conflicts:
	AB/ViewController.m