changed id activation
Merge branch 'develop'