Updated Edit priority and done
Merge branch 'master' of https://github.com/cs2103aug2014-t11-2j/main

Conflicts:
	bin/logic/SparkMoVare$EditType.class
	bin/logic/SparkMoVare.class