Clean up #include
Replace placeholders even if the string is not in the language content

Fix #2044
Test case for #2044
Updated CHANGELOG
Bug fixes
Fix build generator
Regenerated build/
Bug fixes for clang
Regenerated build/
Cosmetic code fix
Merge pull request #2080 from sjinks/issue-2044

Replace placeholders even if the string is not in the language content
Merge remote-tracking branch 'upstream/1.3.0' into 1.3.0

Conflicts:
	build/32bits/phalcon.c
	build/32bits/phalcon.h
	build/64bits/phalcon.c
	build/64bits/phalcon.h
	build/safe/phalcon.c
	build/safe/phalcon.h