Jplugins test
Merge branch 'pav_jplugin'
Merge branch 'master' of https://github.com/pvullioud/japi

Conflicts:
	api/v1/routes.php