set controllers as root controllers to nav controller instead of subviews
Merge remote-tracking branch 'origin/master'