infograph
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/Plugin/Sejmometr/View/Sejmometr/info.ctp
infograph merge fix