qaedq
Merge branch 'Layout_Tester' of https://github.com/SavoniaBeetsBlu/BeetsBlu2 into Layout_Tester

Conflicts:
	res/layout/activity_fullscreen.xml