Added button activity for testing aligning junk on the bottom of the view
Added JUnitTest
Added hgt measurable to player add activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_button_activity2.xml