master
Merge branch 'master' of https://github.com/PassionJHack/passion
Merge branch 'master' of https://github.com/PassionJHack/passion

Conflicts:
	UsingmodeProfileApp/Debug/.tpk/.manifest.tmp
	UsingmodeProfileApp/Debug/.tpk/author-signature.xml
	UsingmodeProfileApp/Debug/.tpk/bin/Profile.exe
	UsingmodeProfileApp/Debug/Profile.exe
	UsingmodeProfileApp/Debug/src/CreateProfileForm.o
	UsingmodeProfileApp/Debug/src/LocationMapForm.o
	UsingmodeProfileApp/Debug/src/ProfileFormFactory.o
	UsingmodeProfileApp/src/LocationMapForm.cpp
master
Merge branch 'master' of https://github.com/PassionJHack/passion