Merge branch 'develop' into hybrid

Conflicts:
	eigen/eigen.F90
	eigen/tlmplm.F90
	global/types.F90
	init/gen_bz.F90
	io/r_inpXML.F90
	main/fleur.F90

eigen/eigen.F90

@@ -329,6 +329,7 @@ CONTAINS
           !--->         set up lapw list
           !
           CALL timestart("Setup of LAPW")
+
           CALL apws(DIMENSION,input,noco, kpts,nk,cell,l_zref, mpi%n_size,jsp, bkpt,lapw,matind,nred)
 
           CALL timestop("Setup of LAPW")

init/gen_bz.F90

@@ -64,18 +64,6 @@ SUBROUTINE gen_bz( kpts,sym)
    END DO
 
    ! Set target number for k points in full BZ
-   kpts%nkptf = kpts%nkpt3(1)*kpts%nkpt3(2)*kpts%nkpt3(3)
-   IF(kpts%l_gamma) THEN
-      IF (ANY(MODULO(kpts%nkpt3(:),2).EQ.0)) THEN
-         kpts%nkptf = kpts%nkptf + 1
-      END IF
-   END IF
-
-   ! Apply symmetrie operations to all k-points of IBZ, test whether
-   ! generated k-point already is in the full BZ set of k-points, and
-   ! add it if it is not yet in this set.
-
-   kpts%bkf = 0
   
    !Add existing vectors to list of full vectors
    print *,"WARNING from gen_bz"