Merge branch 'hotfix/1.1.1'
Merge branch 'release/1.2'
Merge branch 'release/1.3'
Merge branch 'release/1.3.1'
Update images for HiDPI
Update image resources on help for HiDPI support
Add and update syntax coloring definitions

- add: Apache (v1.1), Markdown (v1.0.2) , Scala (v1.0), XML (v1.1)
- update: PHP (v2.2), Python (v2.0.1)
Update credits
Fix a localized string on preferences pane
Add spaces between words on toolbar labels
Merge pull request #4 from 1024jp/fix_toolbarlabels

Add spaces between words on toolbar labels
Merge pull request #3 from 1024jp/fix_ticket29798

Fix a localized string on preferences pane
Use system font to status bar
Add new syntax files to the project
Merge pull request #1 from 1024jp/retina-enhancement

Retina enhancement
fix project for new resource
Merge pull request #2 from 1024jp/update-syntaxdefinitions

Update default syntax definitions

Conflicts:
	CotEditor.xcodeproj/project.pbxproj
add syntax coloring
Merge pull request #5 from 1024jp/fix_ticket29850

Use system font to status bar