Added navigation view controller hierarchy + other view controller classes
Merge remote-tracking branch 'origin'