add catalog support and uploader
upload and catalog resources
Merge remote-tracking branch 'origin/master'