Merged changes from master
Added new top level view controller to grant common abilities to all sub view controllers
Migrated app resources to separate bundle
merged in changes from dev