merge master.
Removed Slam source code for testing.