/
Merge branch 'master' of github.com:metaer/pframe

Conflicts:
	config.php