Update NEWS
bump version
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  bump version
  Update NEWS

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5'

* PHP-5.5:
  bump version
  Update NEWS

Conflicts:
	configure.in
	main/php_version.h