servor debugging test 1
modules updtates & imce added
merge conflict
merge conflict fixed and .htaccess ignore by git from now on