Add link to whatsmy.info to README.
Removing unused C# console app refs
C# console app can run with .NET 3.5 instead of 4
Add C++ port
New entries for Spiders, Espial Smart TV, plus fixes for Windows Phones with Android in the UA string.
Merge pull request #429 from gquinones/master

New entries for Spiders, Espial Smart TV, plus fixes for Windows Phones ...
add new spider regex definitions and associated tests
Merge pull request #430 from Ironholds/master

add new spider regex definitions and associated tests
Refined descriptions of CFNetwork versions of iOS. Added PlayStation 4 UA re.
merged tobie
Merge pull request #431 from gquinones/master

Refined descriptions of CFNetwork versions of iOS. Added PS 4 UA
Merge pull request #347 from asuhan/master

Add C++ port
Merge pull request #401 from atifaziz/cs-app-cleanup

Remove unused refs from C# console application
Merge pull request #309 from sandinmyjoints/link-readme-to-whatsmyua-info

Add link to whatsmy.info to README.
handle $1 replacements in java parser
Merge pull request #434 from emidln/emidln/add_dollar1_os_replacements_to_java

handle $1 replacements in java parser
Fix #438 - Add fallback to avoid ImportError in Google App Engine (no pkg_resources)
Merge pull request #439 from tmeryu/add-gae-support

Fix #438 - Add fallback to avoid ImportError in Google App Engine (no pkg_resources)
Merge remote-tracking branch 'tobie/master'

Conflicts:
	java/src/main/java/ua_parser/OSParser.java
	regexes.yaml
	test_resources/test_device.yaml