Removed common object from make system
Merge branch 'master' into gui
Applied changes of Makesystem
Solved invalid Application ID Warning