Merge branch 'refs/heads/feature/issue45_opacity' into develop (close #45)

Conflicts:
	CotEditor.xcodeproj/project.pbxproj