Merge pull request #34 from jgrip/master

Added Catalyst 3560CG-8PC-S
revert the SQL query changed in 597896f

fetchPortsAndLinks: the SQL query optimization performed in 597896f
commit, was incorrect. It did not respect the fact that there could be
such rows that X.porta = Y.portb. But this could happen since the port
may be linked multiple times now.

So reverting the slow but correct query.
renderPopupTraceRoute: reverse sort order
grouping of SLB cells in triplet list

cmp_array_sizes: compare array sizes
groupTriplets: calculate rowspan numbers for each triplet item in the
list
renderSLBTriplets2: use groupTriplets

Conflicts:
	wwwroot/inc/functions.php
groupTriplets: bug was fixed
SNMP sync: 100M Huawei interface name changed

quidway-any-100TX: eX/X/X changed to etherX/X/X
Huawei VRP 5.110/5.120 dictionary items

Conflicts:
	wwwroot/inc/dictionary.php
Cisco IOS 15.1 switch OS type.

Huawei VRP 5.110, 5.120 renamed to 5.11 and 5.12
SLB: fwmark config generating enhancement

Ability to generate multiple 'virtual_server fwmark XXX' sections
for each IP family, if RS pool contains both v4 and v6 real servers.

Also, do not generate virtual_server section without active real servers
API change: constructIPRange and IPNetworkCmp

constructIPRange: default mask is the maximum possible mask for an
address family
IPNetworkCmp: new return value '2' to make this function symmetric
SLBv2: protection from duplicating SLB links

createTriplet: use addSLBIPLink/addSLBIPLink instead of direct SQL
inserts
new Cisco ASR dict items
mgmt link on FQDN supports any protocol

getMgmtProtosConfig: new func
formatAttributeValue: switch from hardcoded protocols array to the configured one
convertMgmtConfigVars: helper for converting old var values to the new format

Conflicts:
	ChangeLog
	README
	wwwroot/inc/upgrade.php
fix SQL syntax error
SNMP sync for Huawei CE switches now creates con0
update RE_STATIC_URI regex
fix http status in printStatic404()
changelog lines for Aleksandr Balezin's fixes

Conflicts:
	ChangeLog
vrp85Read8021QConfig: fix vlan list parsing
ios12ReadMacList: ignore port named 'Drop'