Merge branch 'development'
made many misc changes to curata site.
added new buttons to dev branch