New modal dialog for item expiry
Merge remote-tracking branch 'upstream/master' into bootstrap

Conflicts:
	view/php/theme_init.php
Merge branch 'bootstrap'
Merge
Correction
Correction 2
Merge correction
Use the red matrix icons
Merge pull request #249 from cvogeley/master

New modal dialog for item expiry