Add .gitignore
* added modules to default project Makefile
* fixed Makefiles for test_shell and default project
Merge remote-tracking branch 'upstream/master'