Merge branch 'master' into 'master'

Marius Cramer

2015-11-12 8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec

 interface/web/login/templates/index.htm

@@ -25,4 +25,4 @@
                  <tmpl_if name="pw_lost_show"><button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='pw_lost_txt'}" onClick="document.location.href='password_reset.php';">{tmpl_var name='pw_lost_txt'}</button></tmpl_if>
                  </div>
                </fieldset>
                  </form>
                  </form>