Testing commit for git issues
Test
Reverting change
;llkj
Merge branch 'master' into AAAAAAAAAAAAAAAAAAAAA

Conflicts:
	Code/Android/src/res/layout/fragment_project_detail.xml