Main Branch Update
Templating
User Authentication
Merge branch 'user-authentication'