Merge remote-tracking branch 'eric/master'
Merge branch 'master' of github.com:jessepitel/mobileDrive
Merge branch 'master' of github.com:klinginE/mobileDrive
Changed contents dictionary keys to lowercase in iPad controller.
getJSONContentsIn now returns NSData object representing JSON instead of a JSON formatted string.
Got actual image name from image picker and fixed menu bug that allowed more than one action sheet to appear.
Server uploads and downloads files using NSData objects. When uploading the overwrite functions needs to be tested after a bug in the browser is fixed.
Merge remote-tracking branch 'jesse/master'

Conflicts:
	mobileDrive/IPadTableViewController.m
	mobileDrive/dbfs/DBInterface.m
Merge remote-tracking branch 'mike/master'
I added a way to see pictures on the browser.
Merge remote-tracking branch 'kling/master'
I put the extension lists in the app delegate.
Pulled from mike.
Merge remote-tracking branch 'seb/master'
Tested iPad upload size.
Change default file type to just be "file"
Allow user to upload a file multiple times in a row