Added support for @ characters in model names, moved long ids to @location, and introduced short ids
Merge branch 'master' of https://github.com/OPENi-ict/object-api

because of conflicts
Added support for @ characters in model names, moved long ids to @location, and introduced short ids