ApiTest
Merge branch 'master' of https://github.com/juxtalearn/clipit
Merge branch 'master' of https://github.com/juxtalearn/clipit
ClipitUserTest changed
Merge remote-tracking branch 'github/master'

Conflicts:
	mod/clipit_core/tests/ClipitUserTest.php