made new changes
Merge origin/master

Conflicts:
	sportsapp/config.xml