Fix ios6 deltas
Modified navigation bar frame
Minor bug fix
Bug fix
Fix mistake
Merge branch 'develop'. Modified for #41