merge rackspace files branch.
add loading indicator