some layot changes
Merge branch 'pawel' into marta

Conflicts:
	Sensible/js/WebChart.js
finished timeline