ios5 fixes
Merge branch 'master' of github.com:regennz/HierarchyApp