Delete old projects, replace them with new maven projects
resolve conflicts

Merge branch 'master' of github.com:Trollhammaren/pts-esd

Conflicts:
	Movement system/src/esd/movementsystem/Main.java