Fixed replay-tracking option to parse different sites ID.
Fixed if condition.
Add Amazon S3 log format to import_logs.py
Create sample log file using Amazon S3 log format
Merge pull request #36 from lesensei/master

Add Amazon S3 log format to import_logs.py

Thanks @lesensei!
[ci skip]
Merge pull request #34 from clearcode/master

Modify replay tracking to use site ID in query string when using replay-tracking option.
Removing tets for content-length since for some reason, it fails for me (ie. the call in tests/PHPUnit/bootstrap.php returns:
Piwik should be running at: http://localhost/piwik-master/
but this URL returned an unexpected response: 'ERROR fetching: Content length error: expected 11 bytes; received 36826 bytes...'

Not sure why the contentLength is wrong, so I just remove it completely
Merge remote-tracking branch 'origin/master'
Fixing build (make sure regex format checks for end of line in log import script).
Refs #3632, add integration test for import script replay tracking.
Refs #3632, Remove stray debugging code.
Fixes #3632, refactor/tweak pull request #34 merge.
Refs #1845, display current site's host in help text/description of tracking code admin page's inputs.
Minor changes
Reverting change I wasnt supposed to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
most important first
Delete unneeded .gitignore
[ci skip]
Merge branch 'master' into datatablerefactoring