Merged with Kibana 3 - milestone 2. Finished technical merge. Still many UI changes needed to complete the merge.

Signed-off-by: ohanetz <o.hanetz@gmail.com>