New Dev Server with Test Server integration and multiple layouts#2

estherbrunner merged 2 commits intomainzeixcom/le-truc:mainfrom

serverzeixcom/le-truc:serverCopy head branch name to clipboard