Merge pull request #5 from QUICC-FOR/dev_grid

Upgrading master branch; Add viewer; modifs on makefile
fix errors in compiling