fixed bug that prevent media items from being uploaded
fixed wrapping issue
Merge branch 'development' into bug-update_cache
added some comments