Working on education for iPhone
Merged Education changes