småpirk
Merge remote-tracking branch 'origin/master'
add template code for icon images
Merge branch 'master' of github.com:UKMNorge/UKMresponsive