using real imagefield
Merge branch 'imagefield'