some changes
Merge branch 'hydro-devel' of ash:~/git-repo/pelican_ctrl into hydro-devel

Conflicts:
	src/PelicanPosCtrl.cpp
Merge branch 'hydro-devel' of /home/autolab/git-repo/pelican_ctrl into hydro-devel