[17/35] Merge branch 'master' into ui-plugins

[bfederle]

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bf2691c5/ui/css/cloudstack3.css
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bf2691c5/ui/index.jsp
----------------------------------------------------------------------