add userAuth info to model before tpl rendering
merge
hide *.orig files from git