WAR: update to latest master
TUTORIAL: Rename and update content