Merge pull request #1 from mirador/master

update
Graphical feedback for the login/upload feature.
merged changes from master, solved conflicts
merged UI changes
Merge branch 'nekoui-master'