made compile again
Merge branch 'amsterdamDemo' of git@github.com:FITeagle/sfa.git into amsterdamDemo