Testing user photos upload
Merge branch 'master' of git://github.com/paramoreagency/channel_api

Conflicts:
	config.php