Added user apikeys, made ajax api available via apikeys, restified ajax api (WIP)
Merge remote-tracking branch 'upstream/devel' into devel