added static folder to STATICFILES_DIRS
Merge branch 't1_user_info'