Merge Request

Includes:
1) fix for Issue #133(File Upload : Close Icon should have the same behavior as the Close Button)