Added wmv and mpeg mime types as valid video files for video uploader
* Maintain file names as is if rename option is off
* Added check to append sting to filename IF a file is in the tmp folder with the same filename
Updated read me to v1.15
Merge branch 'release/1.15' into develop
Merge branch 'release/1.15'
Merge branch 'develop'