Fix app icon, mainInput now always in focus
Merge branch 'V0.5_UI_Updates' of https://github.com/cs2103aug2014-t17-3j/main into V0.5_UI_Updates

Conflicts:
	src/main/java/com/the/todo/MainToDoController.java