Added ability to add put in albums

Problem: if two people are uploading at the same time there are
collisions and it messes everything up.
Possible Solution:
Build a backlog of database commands and execute all at once.
Merge remote-tracking branch 'origin/master' into leon

Conflicts:
	php/test.html
	uploads/IMG_6322.jpg