preparing for merge with dev
merging with dev
added FileDrop to repo
imported fest api
added update with login, again