merge changes from projecttemplate. Card #24 / https://trello.com/c/SaJHo8RB