Merge branch 'view_profile_and_template' into demo