ticket:3 updated makefile
ticket:3 reverted hanges in makefile
ticket:3 fixed middleware name
ticket:3 fixed the test
Merge branch 'master' into t4_context_processor
ticket:4 fixed path to context processor