Sverre's update as of 29.05.2013
Merge branch 'original'

Conflicts:
	Ncode/params.h
Added a NFW halo potential