Added cfg folder
Solved merge conflict
missing include file
merge
some compilation fixes