Updated Spanish translation
Updated Hungarian translation
Updated Hungarian translation
Add conflict_map to git
For conflicts, use MERGED by default, don't change permissions if file is the same
Merge remote-tracking branch 'origin' into svn-updates