fix merge
Merge branch 'manage' of github.com:galetahub/sunrise into manage
uploader_user method for assets
fix dummy for test
bump version