Merge pull request #551 from pranali333/develop

Added Max and step attribute to number in function generate_number
Fixed global album list in select box
Merge branch 'develop' of https://github.com/rtCamp/rtMedia into develop
Change rewrite parameters for album custom post type
Merge pull request #552 from sanketio/develop

Fixed global album list in select box
update spanish translation
version update
fix rtmedia links and settings icons
Check for blank needle in strpos
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