Modifying timeout for profile picture uploads
Merge branch 'profilePictureGatewayTimeout' of https://github.com/nicolaasmatthijs/3akai-ux into profilePictureGatewayTimeout

Conflicts:
	nginx/nginx.conf
Merge branch 'master' into profilePictureGatewayTimeout
Merge pull request #3186 from nicolaasmatthijs/profilePictureGatewayTimeout

Allow for large profile pictures to be uploaded