tag2DB created
deleted unecessary stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Feature.java