Fix c
updated submodules
Merge branch 'master' of github.com:piwik/piwik
Merge branch 'master' of github.com:piwik/piwik
refs #4126 added some tests, fixed some bugs and moved some methods where they belong to not have a circular dependency