merged master into this branch and changed the extends layout-2013 to layout on judges/new, since the new layout is not defined to here yet