Merge pull request #50 from absingla/master

Fix the url to get server-utc-time for cpu/mem chart
Corrected the root directory path for the allocate floating ip menu item
Merge pull request #52 from vishnuvv/DirChanges

Corrected the root directory path for the allocate floating ip menu item
Add seperate job keys for CPU flow series data
Merge pull request #55 from absingla/master

Bug Fix for Alerts modal
Merge pull request #54 from Juniper/jobs

Add seperate job keys for CPU flow series data
Removed the grid datasource onupdate event handler on individual pages and moved to common place in slickgrid-utils.js
Merge pull request #56 from vishnuvv/BugFixes

Removed the grid datasource onupdate event handler on individual pages a...
1. Moved common dashboard code to contrail-web-core repository
2. Added an option to specify template name (tab content) while adding new info box/tab in dashboard
Merge pull request #57 from nagakiran/dashboardChanges

1. Moved common dashboard code to contrail-web-core repository
Done BGP peer changes in both nodejs and ui for address family and hold time
Merge pull request #58 from sbavanasi/BGP-Peer

Done BGP peer changes in both nodejs and ui for address family and hold ...
Fixed the issue that vrouter dashboard tab is not rendered correctly in
Firefox
Merge pull request #59 from nagakiran/dashboardChanges

Fixed the issue that vrouter dashboard tab is not rendered correctly in
Floating IP changes wrt change in schema. Earlier FIP used to have VMI and VM UUIDs in same object which is now split. Changes are made to get the instance_ip_address, instance_ip_uuid appropriately
Merge pull request #60 from asbalaji/master

Floating IP changes wrt change in schema. Earlier FIP used to have VMI a...
Added erm-vpn adddress family to the control node type in BGP peer page and in monitor routes page
Merge pull request #61 from sbavanasi/ERM-VPN

Added erm-vpn adddress family to the control node type in BGP peer page ...

Add UT cases performed.
Fixed Bug ID 2611,1325489
FIP(Bug ID 2611)
FIP Name changed in the grid from Floating IP and Pool to Floating IP Pool.
FIP create window got expanded.
Menu name changed to "Manage Floating IPs"
Policy
Removed the single service check in Policy create window when Apply Service is
enabled.
Service Instance(bug id 1325489)
Added Verification if there is no template.
Merge pull request #66 from balamurugang/R1.1

Fixed : Bug ID 2611,1325489
Please update the unit test cases executed.