Did no changes but have to do this to be able to recieve upstream
Merge remote-tracking branch 'upstream/master'. Fetching changes made by Oliver. JSON functionality has been worked on by him.
Added the ios platform to files being commited.
Formated a couple lines of code by pushing "tab". No code was changed.
Merge pull request #2 from TheOther0ne/master

Added the ios platform.