FIx failing tests because of operator precedence
Update gitignore and Makefile for additional entries
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update gitignore and Makefile for additional entries
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update gitignore and Makefile for additional entries
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update gitignore and Makefile for additional entries
Fixed warning "No new line at end of file"
Merge branch 'PHP-5.6'
some extension to the porting doc
Merge remote-tracking branch 'origin/master' into str_size_and_int64

Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c