Added merged jade template with client changes from clientdev branch