admin working with clout branch of frontend
update to work with latest clout version
Merge branch 'dev' into clout
latest versions for frontend