[DB] HEY IT DOES NOT CRASH.
Merge branch 'master' of https://github.com/cs2103aug2014-w13-3c/main
Fixed initialization of Controller and uiController. Sigh.