Happy Diwali
Hi
Hi
Merge branch 'master' of https://github.com/avaiyahardik/electio

Conflicts:
	Electio/src/java/Action/ApproveNominee.java
	Electio/src/java/Controller/UpdateVoter.java
	Electio/src/java/DAO/DBDAOImplementation.java
	Electio/web/election-commissioner/electionDetail.jsp