Set correct version when 2 versions are in control
Network monitoring module for Zentyal

Only enable/disable is now working
Added support to set local networks from the UI
Minor fixes to Objects doc
Added model to define the interfaces to monitor
Merge branch 'master' into ejhernandez/ntop
Show link to NTOP UI and add ntop service

Not open to internal networks due to information breach.
However, localhost users have access.
RedirectHelper interface added

+ RedirectHelper interface to redirect requests from Zentyal
  Remote to specific module HTTP applications
Improve proxy redirections

- Configuration from RedirectHelper modules
- Added query string and referer-based patterns to redirect
Implement RedirectHelper interface to show ntop UI

From Zentyal Remote
Consolidate data only if stored data is greater than interval

Unit tested
Do not call to send when consolidate returns there is no data to send

Unit tested
Change reporterd query time to 5 minutes

Updated changelog with latest changes
Added Ntop reporter reading from RRDs file by now
Now the recollector also works for multiple interfaces

By summing the data
Send bytes in total instead of bps
Use shorter metadata field name for client IP address

This saves space in DB
Properly excluding total bytes
Merge branch 'master' into ejhernandez/ntop

Conflicts:
	extra/scripts/zentyal-unit-tests
	main/core/ChangeLog
	main/remoteservices/ChangeLog
Rename from Monitoring to System Monitoring

Change name to System Monitoring to avoid confussion with new
Networking Monitoring module