common layout changes
common modal fix + edit action modal
Merge commit '809ad5d' into simion

Conflicts:
	webroot/css/style.css
edit/delete link fixes
Layout
Merge remote-tracking branch 'origin/simion'

Conflicts:
	webroot/css/layout.css