re-add MEAM part
fix import
merge version info from trunk
merge changes from trunk
merge from trunk
merge from trunk
merge from trunk
merge from trunk
merge from release
merge trunk
merge from trunk
merge trunk
merge trunk
merge all files from Jeremy except diff_evo.c
indent properly
add rescale_meam and fix compilation
merge latest devel version into meam tree
merge devel
remove version.h when cleaning the tree
Merge branch 'meam'

Conflicts:
	CHANGELOG
	Makefile
	potfit.c
	potfit.h
	simann.c