Update for 20130102
Update for 20130107
Update for 20130108
Update for 20130109
Update for 20130110
Merge branch 'master' of github.com:zschlag/test_wiki