Server side handling 6
Merge branch 'master' of https://github.com/priteshgupta/spotdrop