update user authentication
Merge branch 'master' of github.com:oshribin/TangiPlan

Conflicts:
	log.csv