merged csdefs
TODO list updated
fixed int test
Merge branches 'master' and 'master' of https://github.com/Valtech-NAS/Beta