Stuff
Merge branch 'master' of github.com:sspssp/jpt

Conflicts:
	controller/public.php