Merge branch 'master' of https://github.com/brorfred/tracmass
Removed some merge diffs.
Fixed marge conflicts
Merge branch 'devel' of https://github.com/brorfred/tracmass into devel