Add a basic movement.

Merge remote-tracking branch 'remote/master'

Conflicts:
	CMakeLists.txt