Using the model by handling taxonomies and folders.
Merging
Merge
Merge branch 'master' of
https://github.com/Deepercreeper/AnnotationTool.git

Conflicts:
	src/controller/Controller.java
	src/view/View.java