Adding some basic iPad support; commenting out AFNetworking
Merge remote-tracking branch 'origin/master'