pfSense

Removed flawed HTML.

Add alias support to static routes (needs some testing) Ticket #2239

Conflicts:

etc/inc/filter.inc
        etc/inc/util.inc
        usr/local/www/system_routes_edit.php

When renaming a user, make sure to remove the previous user or it gets left in /etc/passwd.

Remove this faulty piece of gateway code, it overwrites the existing entries that return_gateways_array() returns.
It doesn't take any address families into account either.

Correct the variable names for the duplicate stf check

Remove this piece of code, it loads even on interfaces not configured for track. Really needs asynchronous javascript.

Prevent duplicate 6rd or 6to4 interfaces, these conflict and both use the stf0 adapter. Only 1 can be active.
Move piece of code into function, we need it more places, tighten rules for proto 41 traffic.
Attempt to micro optimize the select box for large amounts of choices. Chrome likes this approach better.

Merge array and keep unchanged values.

Check for this function before calling it to avoid an error when hitting that line for pages that don't include the js file for it.

fix for Bug #2231 --- Dashboard: Traffic Graph: Unable to save settings