Merge branch 'fullservice'
column updated
updating
eleminating compilation warnings
Merge branch 'master' into fullservice