Bug fix version 1,0 for production
resolve merge conflict
added final changes fro 2nd release