Include lang files in project so they'll actually end up in the final build
Merge branch '6.1.4' of github.com:umbraco/Umbraco-CMS into 6.1.4
U4-2553 Double tabs when installing package that makes use of Dictionary Items to translate document types

Added GetRawCaptionById method for the packager so the generated XML is correct
U4-2553 Double tabs when installing package that makes use of Dictionary Items to translate document types

Forgto to commit a file :)
Fixes: U4-2577 Can't save umbraco user - without re-filling in the password

Fixes: U4-541 Wrong dictionary key when using in backend template names
This changes the way that the value that is stored in the auth cookie. Previously we just stored a GUID which was the user's contextid stored in the db, now we store encrypted values of a few necessary user objects. In 6.2 we'll actually set a real .Net user object on the HttpContext. For now, the http module will simply just ensure that the culture is set correctly for the currently logged in user.
Creates an SQL Server version check for bulk sql imports.
U4-2579 BulkPublishController causes YSOD when there are invalid child elements due to InvalidProperties having a null reference
Massively improves performance for the packaging service (converting docs to XML) which is used in republishing the tree.
Minor adjustment related to U4-2560 Working with ContentService can give 2 versions of a document as "newest"
Fixes unit tests
Removes tree icon filters and just ensures the data is formatted on retrieval, this is much better for performance and just makes a lot more sense.
Got content/media thumbnails rendering properly even with old legacy ones (file based).
Ensures all controller names are consistent.
Fixes U4-2587 Regression: Hide Preview Button on nodes that have no template

Now also checks if the template still exists and if it's allowed on that document to determine when to enable the preview button
Merge branch '6.1.4' of github.com:umbraco/Umbraco-CMS into 6.1.4
Got the GetChildren wired up to the back end, updated the sort and list view controls to use the new resource with promises, updated unit tests to support.
Initial work on U4-2571 Need to optimize empty recycle bin
Merge remote-tracking branch 'origin/6.1.4' into 7.0.0

Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln
fix up merge errors
Fixes: U4-2589 Save and Publish is not creating version of document and adds a few unit tests