Microsoft-support
Merge branch 'DeveloperBranch' of https://github.com/DAT255-GLPP/PalPointerApp into DeveloperBranch

Conflicts:
	appcompat_v7/bin/appcompat_v7.jar