Another try to merge new Homework Manager code with ww2.5.2

Mike,

After a more thorough understanding of git, I think I have successfully merged my code with the ww2.5.2 on mgage.  When you get a change, can you do a pull on my code. 

I had to pull down a copy of ww2.5.2 and merge by hand my new changes and I feel like I may have introduced a copy of new bugs, but more than anything, I'd like to see if you can grab the code without troubles.  Let me know. 

Peter