Vector of lists
Merge remote-tracking branch 'origin/master' into savingdata
Some changes to make master compile
Merge branch 'master' into savingdata

Conflicts:
	src/controller/Controller.cpp
	src/controller/Controller.hpp
Removing anjuta from git
Try with anjuta again
Cleaning up after merge
Deleting anjuta-file
Start of restructuring, now with list of vectors
Adding IDs and map- restructuring in progress
Saving vector of current position with timestamp
Setter in Position6DOF
Cleaning up anjuta ... once again.
Minor changes, cleaning up
Merge branch 'master' into savingdata

Conflicts:
	src/controller/Controller.cpp
	src/controller/Controller.hpp
Cleaning up... to be continued
Ready to merge, uncompiled