Merge branch 'master' of github.com:fayland/binary-static into fayland-master

Conflicts:
	README.md
Merge branch 'fayland-master' into mojo_app_tt_rename
Rename complaints_disputes.tt to complaints_disputes.html.tt
Add terms and conditions back, deleted due to merge
Update version, h3 to h2, bets to contracts in terms and conditions
Merge remote-tracking branch 'upstream/master' into mojo_app_tt_rename
Update fastpay cashier deposit, withdraw times
Update grid structure for fast pay under cashier
Merge pull request #37 from raunakkathuria/mojo_app_tt_rename

Mojo app tt rename
Release v2.6.0
Merge remote-tracking branch 'origin/master' into development
Merge branch 'development' of https://github.com/binary-com/binary-static