Merge remote-tracking branch 'origin/master'

Signed-off-by: Jay Rivers <JRivers@printplace.com>

Conflicts:
	OKElection/app/filters.php
	OKElection/app/models/Precinct.php
	OKElection/app/models/Voter.php
	OKElection/app/routes.php
	OKElection/composer.json