minor
Merge branch 'viewer' of https://github.com/MarcSpitz/ldebroux_kjadin_masters-thesis_2014 into viewer