uml
Merge remote-tracking branch 'origin/master' into uml-dia-+-unit-test
unit test
merge fra master
Merge remote-tracking branch 'origin/master' into uml-dia-+-unit-test
Merge pull request #159 from SW2A305/uml-dia-+-unit-test

unit test