Merge branch 'master' of https://github.com/mangazoo/mangazoo_app

Conflicts:
MangaZoo/MangaZoo.xcodeproj/project.pbxproj
MangaZoo/MangaZoo/Base.lproj/Main_iPad.storyboard
MangaZoo/MangaZoo/Base.lproj/Main_iPhone.storyboard
MangaZoo/MangaZoo/ViewController.m
json

parsing