1st one
fixed warning
I1: removed unneccessary things
I1:removed space
Merge branch 'master' into I2_table_name_in_models

Conflicts:
	model.php