dateTime and logo
Merge branch 'origin/master'

Conflicts:
	generators/giixCrud/GiixCrudCode.php