Modifying timeout for profile picture uploads
Added link recognition in comments using a trimpathModifier
Added link recognition in comments using a trimpathModifier
Merge branch 'profilePictureGatewayTimeout' of https://github.com/nicolaasmatthijs/3akai-ux into profilePictureGatewayTimeout

Conflicts:
	nginx/nginx.conf
Merge branch 'master' into profilePictureGatewayTimeout
Making sure that branding image fills all available space
Follow up on review for link recognition in activity, comments...
Merge pull request #3230 from nicolaasmatthijs/brandingBug

Branding image bug
Merge pull request #3186 from nicolaasmatthijs/profilePictureGatewayTimeout

Allow for large profile pictures to be uploaded
Merge branch 'master' of https://github.com/oaeproject/3akai-ux
Merge branch 'recogniselinks' of https://github.com/Coenego/3akai-ux into recogniselinks
Removed mailto recognition