fooling around with git (trying to avoid a huge file...

Signed-off-by: Daniel Dahlkvist (dice) <daniel.dahlkvist@dice.se>
Merge branch 'master' of https://github.com/MesSer1024/dbx_file_handler

Conflicts:
	dbx_file_handler/ShowDatabaseScreen.xaml
	dbx_file_handler/ShowDatabaseScreen.xaml.cs