Merge remote-tracking branch 'origin/master'
improved detection of HTC devices
improved detection of LG devices
improved some detections; added tests
added detection of Puffin browser
Fix integration tests and updated UI submodule.
Merge branch 'master' into comparison_dashboard_changes

Conflicts:
	plugins/SegmentEditor/SegmentSelectorControl.php
Move all segment editor event handlers to single function and allow segment editor html to be recreated.
Updating UI submodule.
Updating SecurityInfo module.
Updating SecurityInfo submodule.
Updating UI test submodule.
Updating SecurityInfo submodule and UI tests submodule.
reverting my broken revert -> we'll add a UI test screenshot for it!
Merge branches 'master' and 'master' of github.com:piwik/piwik
rc4
added detection for RISC OS and it's Oregano browser
improved detections by adding more tests
Test fix for http://forum.piwik.org/read.php?2,111784
Merge remote-tracking branch 'origin/master'