Changed figures from norwegian to english. norwegian figures are moved to appendix
Fixed merge
Merge branch 'master' of https://github.com/mathilwa/Master2013
Merge branch 'mathilde'