some states modification
Merge branch 'PDP' into stateEngine
Controller's currentState modification
Merge commit 'eaede2c090b25c119c3163cb13d35ddc38337e89' into PDP