Merge branch 'master' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

templates/groups/list.tpl

@@ -1,6 +1,6 @@
-<div class="groups list">
 <!-- IMPORT partials/breadcrumbs.tpl -->
-
+<div widget-area="header"></div>
+<div class="groups list">
 	<div class="row">
 		<div class="col-lg-4">
 			<!-- IF allowGroupCreation -->

templates/popular.tpl

@@ -1,6 +1,6 @@
-<div class="popular">
 <!-- IMPORT partials/breadcrumbs.tpl -->
-
+<div widget-area="header"></div>
+<div class="popular">
 	<ul class="nav nav-pills" component="popular/tab">
 		<li><a href='{config.relative_path}/popular/daily'>[[recent:day]]</a></li>
 		<li><a href='{config.relative_path}/popular/weekly'>[[recent:week]]</a></li>

templates/recent.tpl

@@ -1,6 +1,6 @@
-<div class="recent">
 <!-- IMPORT partials/breadcrumbs.tpl -->
-
+<div widget-area="header"></div>
+<div class="recent">
 	<div class="btn-toolbar">
 		<div class="pull-left">
 			<!-- IF loggedIn -->

templates/tags.tpl

@@ -1,6 +1,6 @@
-<div class="tags">
 <!-- IMPORT partials/breadcrumbs.tpl -->
-
+<div widget-area="header"></div>
+<div class="tags">
 	<!-- IF tags.length -->
 	<div class="row">
 		<div class="col-lg-12">

templates/unread.tpl

@@ -1,7 +1,6 @@
-<div class="unread">
-
 <!-- IMPORT partials/breadcrumbs.tpl -->
-
+<div widget-area="header"></div>
+<div class="unread">
 	<div class="btn-toolbar">
 		<div class="pull-left">
 			<!-- IF loggedIn -->

templates/users.tpl

@@ -1,7 +1,6 @@
-<div class="users">
-
 <!-- IMPORT partials/breadcrumbs.tpl -->
-
+<div widget-area="header"></div>
+<div class="users">
 	<div class="row">
 		<div class="col-lg-6">
 		<!-- IMPORT partials/users_list_menu.tpl -->