Merge branch 'release-v1.6.1'
Merge branch 'devel'
Normalize all the line endings
fix for rm (long file list)
fix comment
fix order of variables
update for GOES
bug fix for GOES:add missing vars
catch Qtran errors
add position reading for GOES
Merge branch 'maarble-devel' of github.com:irfu/irfu-matlab into maarble-devel
Added sanity check on years
Fix for cell E_hx
Updated to 20121231
irf: always print current version
c_4_grad: bug fix with time axis
c_4_j: minor fix
bug fix.
Merge branch 'devel' of github.com:irfu/irfu-matlab into devel

Conflicts:
	mission/cluster/c_4_grad.m
Merge branch 'master' into devel