DEV-1.1.0
DEV-1.1.0
DEV-1.1.0
DEV-1.1.0
Merge branch 'develop'

Conflicts:
	CHANGELOG
	upload/js/steam/ajax/steamprofile.js