permission
Merge branch 'master' of https://github.com/unisexx/ppt

Conflicts:
	themes/ppt/_header.php