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