Merge branch 'master' of http://github.com/avaiyahardik/electio
Merge branch 'master' of http://github.com/avaiyahardik/electio
send mail based on approval and rejection
changes for preferential voting
Changes in setText as Html content
Merge branch 'master' of http://github.com/avaiyahardik/electio

Conflicts:
	Electio/src/java/Action/NomineeAction.java