bring code up for pull
Merge remote-tracking branch 'origin/master'
fixes to locally declared viewController