Merge
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Merge remote-tracking branch 'origin/erik' into dev
Refactoring
Merge remote-tracking branch 'origin/dev' into erik