Fix Merge for new gjson layout
Merge branch 'master' of github.com:democraciaconcodigos/election-2013