Moved constants to config file, but they need to be deleted from the rest of the files
Merge origin/master