changes from april 2 morning
Merge branch 'master' of https://github.com/stratcom/module_2
Merge branch 'master' of https://github.com/stratcom/module_2
trying to upload from linux