Merge pull request #77 from jcarlosgarcia/master

App upgrade, collaborators, caching, improved tables... Closes #42