Merge branch 't1_nethen'
ticket:1 modified files according to PEP8
ticket:1 added tests, css, modified views.py