tewaks
Merge branch 'master' into hydro-devel

Conflicts:
	src/PelicanPosCtrl.cpp
added the simulation lunch files