ticket:1
Merge branch 't1' into t3
Merge branch 't3' into t4
ticket:5 fixed typeerror
admin;admin as default superuser credentials
Merge branch 't1' into t3
Merge branch 't3' into t4
Merge branch 't4' into t5
ticket:5 credentials of superuser in tests fixed
ticket:6 fixed admin credentials