#Solve conflict of MainBundle
Merge branch 'master' of https://github.com/maeglin89273/SophiaTag.git

Conflicts:
	SophiaTag/src/edu/ntust/csie/se/mdfk/sophiatag/gui/controller/bundle/MainBundle.java
Merge branch 'master' of https://github.com/maeglin89273/SophiaTag.git
#Every function is implemented, except "Change Root Directory"