Merge pull request #2 from mirador/master

update from master
Merge pull request #3 from mirador/master

update from master 2 july 28
history upload functionality
Merge pull request #4 from nekoui/master

history upload functionality