ticket:1 Fix for Makefile
ticket:1 Merging with master after Makefile was fixed
ticket:1 Merging with master after wsgi.py added
Merge branch 'master' into t1_myContact