Merge pull request #1 from arabianfoz/master

First commit for captionator.
First commit Advanced Search
Merge pull request #2 from barboza2308/master

First commit Advanced Search
Firts commit of admin_permissions
Merge pull request #3 from arabianfoz/master

First commit html5_uploader
First commit for watermark
Merge pull request #4 from IngCarlosColman/master

Send pull