css
Fixed some bugs with double XML escaping
IE problem solved
Merge remote branch 'origin/master' into laura_client2
Merge remote branch 'origin/laura_client2'
IE9 show error on upload
debug level tree to 0
Merge remote branch 'origin/master' into laura_client2
Merge remote branch 'origin/master' into mixed_clients

Conflicts:
	views/beehub_directory.php
Improved 'old client', 'new client' buttons