completed basic file upload

posts json for the location of each image, and posts the album name.
files cannot be removed on this page.
save location for uploads in now in images/photos.
relocated upload.php to php folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	upload.html
	uploads/IMG_6322.jpg
Merge branch 'master' of https://github.com/askho/MGDev