Change display IDs to Strings instead of Int
Merge branch 'master' of https://github.com/cs2103aug2014-w14-1j/main