Fixed unique id related issue

Change-Id: I4cc030f9c7a84400aa058b54d274c17417ee14aa
Merge pull request #32 from Juniper/master

Fixed unique id related issue
Integrated analytics Oracle stats changes in UI,bug id is #1350680
- Flowseries charts in VirtualMachine, Virtual Network details page and the Inter VN stats page(When we click on the links in the topology)
- Earlier the time series charts are with 7 secs granularity and past 30mins now it is 30 secs granularity and past one hour data
- Earlier two queries were issuing for the IN & Out stats now we are getting in same query
- Added the last 1 hr tag where ever we are displaying the last one hour stats
- We are querying the the QE (uuid's in or clause)in the separte call to fetch the stats in instance,network,project,dashboard
Conflicts:
	webroot/monitor/tenant-network/instance/ui/js/tenant_monitor_instance.js

Change-Id: I70f7c366a032915f17025062bba89da1afb9b276
Merge pull request #33 from Juniper/master

Integrated analytics Oracle stats changes in UI, Bug id is #1350680
Merge branch 'master' of https://github.com/absingla/contrail-web-controller into monitoring

Conflicts:
	webroot/monitor/tenant-network/common/ui/js/tenant_monitor_utils.js