Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
removed duplicating #define and used a header file to replace them.
Merge branch 'master'