New changelist
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	AdventureTrack.iml
	app/app.iml
Added and Updated Player Profile layout file