Added PHPDoc
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.example.php
Change database class to a static class