This is causing bugs

The serverside code needs a rewrite.
Merge pull request #1 from wolskis/master

Pulling all of sams changes till now. ..
Updating upload directories.
Merge pull request #1 from abhims/master

Retrofitting back to sam's repo