Merge Services, slick, messaging, movementsystem, gamemap into master from develop.