Modified Project to comply with Gradle
Merge remote-tracking branch 'origin/master'

Conflicts:
	games-common.iml