-Cleaning up code
- bug fix
Merge branch 'hot-fix'
- added filter to allow framework defines to be used within widgets