something went wrong...
something went wrong...
Nothing changed just trying whatever
Merge branch 'master' into templateview

Conflicts:
	tudimapper.pro.user
NewStuff to import window
the is now able to show folders, and you can switch between them
Merge branch 'master' into ImportDialog