fxnote removed in Main, added stuff in integration.
added stuff in integration.
Merge branch 'master' of github.com:TISPIT-GroupRFL/SPIT