merged
resolved merge conflicts
Completed + reviewed latest Dutch locale changes
Fixed merge conflicts for Jasper's commits.
Merge https://github.com/codecombat/codecombat