Some fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Travel.iml
	src/test/logout_handler.go
Making User model