* assign username to template
Merge remote branch 'origin/master'