templates refarsh
Merge branch 'Issue16'
production sphinx cfg
Merge remote-tracking branch 'origin/master'
sphinx.conf.prepared
sphinx conf
test cfg
moderator lists fix
pip-req.txt
project cmd fill upd 4 1.5.1
project cmd fill small upd
cfg upd
settings upd
urls_registration.py
reformat templates 4 1.5
template upd -> rm '../templates/'
Merge branch 'master' of github.com:viewfuhrer/pro-atatat

Conflicts:
	project/templates/resource/search.html
Merge branch 'master' of github.com:viewfuhrer/pro-atatat

Conflicts:
	project/templates/resource/search.html
fix templates
sphinx.conf.prepared