add navbutton
Merge branch 'master' into navItemFix
xcode 5 autofix
Merge branch 'master' into navItemFix
Merge branch 'navItemFix'
fix #23
Merge branch 'navItemFix'