Removed atd files
Merge branch 'master' into state_machine