Change the database extension from .backup.json to .json.backup and
.factory.json to .json.factory for easy to identify which file is the
factory one.
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #49 from lwindg/develop

:+1: Change the database extension for identify which is factory when file format is not json
Feature: Hybrid bundle

- src(mqtt.py, publish.py): fix set_tunnels
- src(core.py): fix register
- src(test_core.py): fix tests
- src(mqtt.py, publish.py): fix set_tunnels
- src(core.py): fix register
- src(test_core.py): fix tests
- src(model2mode.py): remove unuse file
src(core.py): tweak deregister's api
Merge pull request #48 from imZack/develop

src({session, test_core, test_publish}.py): speed tests
Merge pull request #50 from imZack/feature/hybrid_bundle

Feature/hybrid bundle
Add tox and py26 compatiable