Merge pull request #555 from sanketio/develop

Check for blank needle in strpos
added watermark addon info
update watermark content
chagne tab positon in addon page
Quick fix for issue #556
Merge pull request #557 from faishal/master

Quick fix for issue #556
Merge branch 'master' of https://github.com/rtCamp/rtMedia
Merge branch 'master' into develop
version update
filter added for comment delete
Added filter rtmedia_upload_folder_name to rename rtMedia Upload Folder
Merge pull request #560 from pranali333/develop

Added filter rtmedia_upload_folder_name to rename rtMedia Upload Folder
update fontawesome
Merge branch 'develop' of github.com:rtCamp/rtMedia into develop
update translations
version update
update readme
update bootstrap.php
added plugin icon
move font folder