readme
readme alt
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'hotfix-diagram-inn-stat'
Merge remote-tracking branch 'origin/master'
ok
Merge branch 'hotfix-check-balance' into develop