merging with current source repository

1. Fix bug getting individual sections: using github not CouchDB
2. Fix bug of trying to add battery to view, which broke reset
3. FF-fix pull
4. Cleanup 3