Merge remote-tracking branch 'origin/master' into dbal

public/templates/accountedit.tpl

@@ -1,5 +1,4 @@
-
+<div class="well account">
-<div class="well">
 
 	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
 		<div class="modal-dialog">

public/templates/accountsettings.tpl

@@ -1,5 +1,4 @@
-
+<div class="well account">
-<div class="well">
 
 	<div class="account-username-box" data-userslug="{userslug}">
 		<span class="account-username">

public/templates/followers.tpl

@@ -1,5 +1,4 @@
-
+<div class="well users account">
-<div class="well users">
 
 	<div class="account-username-box" data-userslug="{userslug}">
 		<span class="account-username">

public/templates/following.tpl

@@ -1,5 +1,4 @@
-
+<div class="well users account">
-<div class="well users">
 
 	<div class="account-username-box" data-userslug="{userslug}">
 		<span class="account-username">