Merge branch '2.5'
Merge branch '2.5'
fix menu length to 10000
fix diverse js and template errors