updates master

Routing complete with the exceptions: Statistics and progression through a game.
Implemented game logic in jQuery, missing adaptation to Angular