Merge pull request #1 from TheOther0ne/master

Pull request 1
Added side panel things and created articles.html
started trying to get the JSON to work in articles.html with handlebars. Unsucessful...
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.