Normalize line endings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/vn/jv/persist/domain/User.java