Added routes and premissions array
Merge commit '00b8fd9673fce187aa039c77a5d0a7f9afde73e4' into HEAD
Merge problem