form del
Merge branch 'Samantha' of https://github.com/MINMINNCU/modules into Samantha

Conflicts:
	mod_notify/tmpl/default.php
Merge branch 'Samantha' of https://github.com/MINMINNCU/modules into Samantha