WIP, not sure which direction to go
Merge branch 'master' into scrolling

Conflicts:
	Gemfile
	log/development.log
WIP for resizing
Content and headers resize, scrollbar appears when needed