update some small things
Merge branch 'master' of https://github.com/abrj/Ios_2013