Merge branch 'master' of https://github.com/auhtc/AnkaFelix

Conflicts:
	AUHTC/AUHTC/View/Map.xaml
merge
Merge branch 'master' of https://github.com/auhtc/AnkaFelix

Conflicts:
	AUHTC/AUHTC/View/Map.xaml