Fixed php 5.4 tests
Merge remote branch 'origin/master'
Added DataGridView relation in HeaderView and CellView