Fixed an UI bug that duplicates an Hr Tag
Resolved merge conflicts and incorporated latest changes from viknesh

Conflicts:
	wsgi/voteforindia/templates/index.html