finished conversion to json-p
Merge branch 'develop'
fixed member_controller bug
finished bill votes