first commits of unicorn conversion
unicorn updates
Merge branch 'master' into beta