changed makefile for my computer
Merge branch 'devel' of github.com:naokin/btas into devel
fixed const error in TConj
added STConj for conjugation of block sparse complex matrices

Changed Dimm for STArray, added <typename T,typename U> for multiplication of real diagonal with complex full matrix
Merge branch 'devel' of github.com:naokin/btas into devel

Conflicts:
	include/btas/DENSE/TConj.h