merging develop into master
merging develop into master

jainanisha90/WeVoteServer,wevote/WeVoteServer,wevote/WeVoteServer,wevote/WebAppPublic,wevote/WebAppPublic,wevote/WebAppPublic,jainanisha90/WeVoteServer,jainanisha90/WeVoteServer,wevote/WeVoteServer,wevote/WeVoteServer,wevote/WebAppPublic