Merging changes from parent back in, fixed some issues in container view with screwy nav bar, positioning of pull nav for ios 6 support