Changed imports of Collections to correct ones.
Merge branch 'master' of https://github.com/cs2103aug2014-w11-2j/main
Formatted most files.
Removed warnings from most files.