removed PowerFactor from Gross/Net entirely.
updated status.html with new format
Merge remote-tracking branch 'upstream/app-restructure' into app-restructure