Removed todos from each file. Fixed erroneous header tag in backup.html.
Reintegrated v4-dev branch into trunk. Trunk now contains v4 development tree