Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php

hide upload progress bar and cancel action in IE < 10

Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments

introduction of display names

only change display name if the display name from the current user was changed; add correct display name to new user

Add Default Robot Disallow

Permanently display shared status icons

This is needed for security reasons - often people looking to exploit applications will search for something in a certain version of a web application and find many sites to exploit. This stops that from being so easy.