Moved entry class from cpp file to makefile
Merge remote-tracking branch 'MyGitLab/master'