Merge pull request #1 from kbalog/master

Merge from master
Merge pull request #2 from kbalog/master

Merge
Started working om Step3.tpl
Merge pull request #11 from petterausterheim/master

Merge pull request #1 from kbalog/master