fix requirements.txt and url comma fix
shift model and draft of templates
wrapup shifts
Merge branch 'glisti'