Revert "Merge pull request #1218 from ditorelo/1213b"

This reverts commit 0d313c1b3e13430e64d60d05d0f681850cbd95c6.
Related to #1218 #1233
Normalize json markers to object #1233
Update upload.php

There was a bug in multiple file uploads, now I've fixed.
Merge pull request #1286 from dmahesh22/master

Update upload.php
Merge branch '2.7.2b' of https://github.com/ushahidi/Ushahidi_Web
fixed syntax on sql upgrade
re-add code for twitter actions
Merge branch '2.7.2b' of https://github.com/ushahidi/Ushahidi_Web
Feed Category
Minor fixes in scheduler
Minor fixes in s_alerts.php
Merge pull request #1304 from ovruni/master

Feed Category
fixed sql syntax
merge ushahidi