FIX bug: setId() doesn't setHasId() properly.
Merge branch 'master' of https://github.com/cs2103aug2014-T13-2J/main