Add changes from meeting with Kim the 30th of sep 2014
Add a new menu-block template