First submission
Merge branches 'bipasaBallot' and 'master'