fixed merge problem
fixed one touch vote persistance
Merge branch 'master' of https://github.com/hippiehunter/Baconography