Administrator javaDocs, ++ @ viktor
Shizzle van mark!
Merge origin/master