EDRMedeso/Test1 — pull request #3 by kjetilrognlien (2014-10-07 11:10:14+00:00)
Title: Kjetils branch

Pulling kjetils branch back to master