Merge branch 'master' of https://github.com/OwenNash/TaxE

Conflicts:
	core/src/resources/Thumbs.db
Merge branch 'master' of https://github.com/OwenNash/TaxE

Conflicts:
	core/src/resources/Thumbs.db
Merge remote-tracking branch 'origin/master'