added ip_address, removed location from vote
ip address is set for new votes
Merge remote-tracking branch 'philipp/master' into philipp
Merge pull request #32 from philipppahl/master

changed the location to ip_address in vote
Merge remote-tracking branch 'origin/master'
Allow all related porposals to show
Merge remote-tracking branch 'upstream/master'
Billsaythis:  homepage1-b Patch
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'