Custom view for Ai fragment and for PvsP
Merge remote-tracking branch 'origin/master'

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
 Custom view for Ai fragment and for PvsP