added profile templates and updates from sonata-develop branch