pg
Merge branch 'master' of https://github.com/watert/md-portal

Conflicts:
	index.php