Merge branch 'develop' into 'master'

Gemfile

Gemfile.lock

Rakefile

_data/apidefinitions/account_by_key_api.yml

_data/apidefinitions/account_history_api.yml

_data/apidefinitions/bridge.yml

_data/apidefinitions/broadcast_ops.yml

_data/apidefinitions/condenser_api.yml

_data/apidefinitions/database_api.yml

_data/apidefinitions/follow_api.yml

_data/apidefinitions/jsonrpc.yml

_data/apidefinitions/market_history_api.yml

_data/apidefinitions/rc_api.yml

_data/apidefinitions/reputation_api.yml

_data/apidefinitions/tags_api.yml

_data/apidefinitions/transaction_status_api.yml

_data/archived_urls.yml

_data/glossary/index.yml

_data/objects/config.yml

_includes/api-template.html