changes for integration test
changes for intergration test2
Merge branch 'setId-chuyu' of https://github.com/cs2103aug2014-w13-4j/main