ticket:2 fix fixtures
ticket:2 fix settings and urls
ticket:3 fix settings and urls
ticket:2 fix merge
ticket:3 merge
ticket:4 test failed
ticket:4 test passed
ticket:4 fix req
ticket:4 fix req
Merge branch 't4_edit_data'
ticket:5 test failed
ticket:2 fix requests
ticket:2 fix requ2
ticket:4 fix test, refact view
Merge branch 't4_edit_data'
ticket:5 add program functionallity. test failed
ticket:4 fixing ajax
ticket:4 fix view
ticket:5 test passed
ticket:5 del img