adding integration steps
Merge branch 'master' into integration

* master:
  Build clean
  update to interation
made change in wrong branch
fixing confilcts
some error
some bug
fixing conflict in jakefile