fix resize ticket
Merge branch 'timeline' of https://github.com/bedita/tickets into timeline

Conflicts:
	webroot/css/module.css