Merge pull request #58 from OkayX6/develop

Fix compilation error
Minor
foo
Merge branch 'develop' of https://github.com/JetBrains/FSharper into develop

Conflicts:
	src/fsharper/Services.FSharp/src/Analyses/Bulbs/FSharpContextActionDataBuilder.cs
	src/fsharper/Services.FSharp/src/Analyses/Bulbs/FSharpContextActionDataProvider.cs
	src/fsharper/Tests/FSharpParserTest.cs
	src/fsharper/Tests/Tests.csproj
fix git's awful automatic merge

i hate git!
Merge pull request #59 from OkayX6/develop

Support for record and union types + parser test
fixes #52

but what did I just fix?
wow, git really sucks doesn't it?