- line chart
- update controller
Merge branch 'develop' of github.com:asidorov01/service-jam into develop

Conflicts:
	src/Jam/MainBundle/Resources/public/less/bootstrap.less
	web/css/compressed/layout.css
	web/css/compressed/layout_bootstrap_1.css