Add NerIndexPickerTest
add hotkey for help
rename modal to model
Merge branch 'master' of https://github.com/cs2103aug2014-w15-2j/main

Conflicts:
	src/dataStore/DataStore.java
	src/test/DataStoreTest.java