docs m.m.
Merge branch 'master' of github.com:larsmw/jasen

Conflicts:
	public_html/includes/classes/Database.php