added rule and test
fixed test
fixed test
fixed indent
added rule and test
added test
added rule and test
changed rule
added rule and test
added rule and test
Merge pull request #157 from mimmi20/issue-156

Fixes #156
Merge branch 'issue-146' of https://github.com/mimmi20/browscap into mimmi20-issue-146

Fixes #146

Conflicts:
	tests/fixtures/TestUserAgents.php
Merge branch 'issue-145' of https://github.com/mimmi20/browscap into mimmi20-issue-145

Fixes #145

Conflicts:
	tests/fixtures/TestUserAgents.php
Merge branch 'issue-147' of https://github.com/mimmi20/browscap into mimmi20-issue-147

Fixes #147

Conflicts:
	tests/fixtures/TestUserAgents.php
Merge branch 'issue-148' of https://github.com/mimmi20/browscap into mimmi20-issue-148

Fixes #148

Conflicts:
	tests/fixtures/TestUserAgents.php
Merge branch 'issue-149' of https://github.com/mimmi20/browscap into mimmi20-issue-149

Fixes #149

Conflicts:
	resources/user-agents/crawlers/general-crawlers.json
	tests/fixtures/TestUserAgents.php
Merge branch 'master' of https://github.com/browscap/browscap into extended-data