added missing function call
Merge branch 'master' of https://github.com/getshop/FrontEnd
Merge branch 'master' of https://github.com/getshop/FrontEnd
testing authentication related to java backend.
Merge branch 'master' of https://github.com/getshop/FrontEnd
moved getapi to factorybase.
Merge branch 'master' of https://github.com/getshop/FrontEnd

Conflicts:
	events/API.php