added master_uus
added uus.coffee
Merge branch 'new_feature'