mailer library
Merge branch 'master' of github.com:jarno-steeman/Rock-2-PHP-Framework
basemarkdown
Merge branch 'master' of github.com:jarno-steeman/Rock-2-PHP-Framework

Conflicts:
	global/libraries/mailer.rlib/library.php