Merge branch 'master' of https://github.com/Krill221/RioCard
Merge branch 'develop' of https://github.com/Krill221/RioCard into develop
30 %
40 %
60 %
Merge branch 'hotfix-iframe' into develop
100 %
101 %
Merge branch 'feature-stat-graph' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/stat_controller.rb
	app/views/stat/all_main.html.erb
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'