Added Custstom grid files.
Added files, pep8-ified CustomGrid, etc.
Commented out unused method, to remove last error marker in code analisys.
Merged conflicts