Fix bug in beta10
submodules
beta11
Fixes #3800 Adding indentation up to level 12, thanks for the suggestion!
Move containing <div> rendering of UIControl to new template, add new custom Twig tag to render Views and allow selected segment of segment selector to be determined by PHP code.
Goal delete fix

Disallow to delete all conversions for given idgoal (across all websites) after goal (soft)delete.
Merge pull request #220 from quba/patch-3

Thanks for the PR, good find and nice to know this is fixed.
Added a setSiteAliasUrls method to the API

This method works in a similar way to the addSiteAliasUrls method, but
it completely overwrites the URL list rather than merely adding to it.
Merge pull request #221 from crispygoth/SitesManager_setSiteAliasUrls

Added a setSiteAliasUrls method to the SitesManager API. Thanks for the Pull request!
refs #4439 disable eAccelerator if enabled (just disabling optimizing did not work) and display a message in the admin UI. Also disabled eAccelerator during tracking. We might need to move the method to detect eAccelerator to another place, not sure if this is the best one
Refs #4439 inlining the message as to not create new translation for this edge case.
Refs #4563 Hiding message that config is not writable, when writing to the config file is disabled anyway.
Refs #3962 Removes undocumented feature of adding user agent column.
Fixing UI tests by hardcoding plugins to load and removing admin_plugins screenshot test. Use actual mouse/keyboard events in UI screenshot testing.
refs #4631 started to work on installing updates during installation in case we reuse existing tables. Problem: In case there are updates available and one of those updates writes a config the installer thinks we are already done. Therefore we do now create the config file as early as possible and before the install the updates. We create the config file once we have the database information. Also allows us to remove the db_infos session hack. While installation is in progress we set a flag in General currently named install_in_progress (tbd)
Merge branch 'master' of github.com:piwik/piwik

Conflicts:
	tests/PHPUnit/UI
Fixing build (add missing plugin for tests).
Updating submodule.
Fixing build.
Fixing build.