Begin split of functional and non functional
Merge branch 'master' into reqs
Reqs en alles af