ticket:3 changes to Makefile
ticket:3 test rewrited
ticket 3: changes in db
ticket 3: done
Merge branch 't3_middleware'