Applying the main 3.6 changes that were already done (as seen by the https://github.com/TeamMentor/Dev/compare/master...3.6_Release diff)

The main items not added where:
  - new MVC model (which was used for the Markdown support)
  - Markdown support
  - Js Tests using JsDriver
  - NodeJS support
(first commit after fixing number of conflicts)

Merge branch 'master' into Apply_3_6_Fixes

Conflicts:
	Web Applications/TM_Website/Html_Pages/ControlPanel/WebEditor/WebEditorService.ashx
	Web Applications/TM_Website/Html_Pages/Gui/Panels/About_TeamMentor.html
	Web Applications/TM_Website/TBot/Admin/Config/Edit_TMConfig.cshtml
	Web Applications/TM_Website/TBot/NGit/GitDiff_UserData_Commit.cshtml
	Web Applications/TM_Website/TBot/NGit/GitDiff_UserData_File.cshtml
	Web Applications/TM_Website/TBot/NGit/GitStatus.cshtml
	Web Applications/TM_Website/TBot/Views/Git/GitDiff_XmlDatabase_Commit.cshtml
	Web Applications/TM_Website/TBot/Views/Git/GitDiff_XmlDatabase_File.cshtml
	Web Applications/TM_Website/TBot/Views/GitDiff_XmlDatabase_Commit.cshtml
	Web Applications/TM_Website/TBot/Views/GitDiff_XmlDatabase_File.cshtml
	Web Applications/TM_Website/TBot/Views/User_Edit.cshtml
	Web Applications/TM_Website/TM_Website.csproj
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Authentication/TM_Authentication.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Schemas/NewUser.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Schemas/TMConfig.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Schemas/TMUser.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/TMConsts.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/TM_StartUp.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Users/TMConfig_ExtensionMethods.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Users/TMUser_ExtensionMethods.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Users/TM_UserData.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Users/TM_UserData_Ex.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Users/TM_UserData_Ex_ActiveSessions.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Users/TM_UserData_Ex_Git.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Users/TM_UserData_Ex_Users.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Users/TM_UserData_Ex_Users_Persistance.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Utils/Git.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Utils/HttpContextFactory.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/Utils/SendEmails.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/WebServices/TM_WebServices.Config.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/WebServices/TM_WebServices.Users.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/WebServices_REST/Controllers/TM_REST_Users.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/XmlDatabase/TM_Xml_Database.Library.Load_and_FileCache.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/XmlDatabase/TM_Xml_Database.cs
	Web Applications/TeamMentor.CoreLib/TM_AppCode/XmlDatabase/TM_Xml_Database_Ex_Config.cs
	Web Applications/TeamMentor.CoreLib/TeamMentor.CoreLib.csproj
	Web Applications/TeamMentor.UnitTests/Asmx_WebServices/Test_WebServices_User_Management.cs
	Web Applications/TeamMentor.UnitTests/Messaging/Test_Email.cs
	Web Applications/TeamMentor.UnitTests/TM_XmlDatabase/Test_Users_Creation.cs
	Web Applications/TeamMentor.UnitTests/_Temp/NGitAPI_ExtraExensionMethods.cs
	Web Applications/TeamMentor.UnitTests/_Test_ConfigAndHelpers/Moq/Test_API_Moq_HttpContext.cs
Number of fixes to issues created by Merge of previous 3.6 branch
Setting version to 3.5 - Beta 1
minor CS Proj fix
Upgraded to VS2013
Updated GAnaltics file
Couple new helper extensions methods
Removed OnlyLoadUserData code
Renamed class TMServer into TM_Server
Moved NGIT author name and email values into TMConsts
Firebase first log entries now only happen if Firebase is configured
Number of TM_Server related fixes
New users now (Correctly trigger a git commmit to save its data)
Started refactoring of TM_Xml_Database load sequence
Removed Server side GoogleAnalytics code (which was not being used)
Removed code that (was supposed to) reload the TM_Xml_Database in memory
Added multiple Unit tests on the TM_Xml_Database setup and load sequence
Fixed number of UnitTest issues (related to recent 3.4.1 changes)
Added new TM_Status class
Fixed couple issues with CSProj file

see http://stackoverflow.com/questions/19718281/external-vs2013-build-error-error-msb4019-the-imported-project-path-was-not for the change made to TM_Website.csproj
Trying to fix the  "target "pipelinePreDeployCopyAllFilesToOneFolder"
error also seen here: http://blog.ploeh.dk/page4/
Another minor fix attempt for 'target "pipelinePreDeployCopyAllFilesToOneFolder" missing'  issue
One more attempt at fixing the issue

Now with info from: http://stackoverflow.com/questions/20003559/upgraded-from-vs2010-to-vs2013-now-i-cannot-publish
Some refactoring on the TM_Xml_Database load and start up code (on main and test code)
trying to fix TeamCity Compilation prob
Another test
Upgraded .NET version to 4.5.1
Version set to "3.5 - Beta 2"
Major refactoring of how the main TM XML Database path is calculated
Major refactoring to the login that maps the TMConfig (for example web root value is now tracked by the TM_Server object)
Temporarily made Debug.aspx viewed by non-logged in Users
TM_Status now uses instance variables (vs static)
Improved error logging on FilesIntoWebRoot
Removed ability to configure Library Path directly (including via webservices)
Moved all code related to the TM Xml Database configuration to the TM_Xml_Database_Config class
Fixed multiple UnitTests
Fixed all Unit Tests errors (locally, now let's see on TeamCity)
Set DEFAULT_PBKDF2_INTERACTION to 5000 (the previous value of 20000 was causing too much performance impact on QA and live servers)
Renamed TM_Xml_Database field TM_Server_Config to Server
Fixed couple UnitTests
Allowed the ability to start TM_Xml_Database with a values/configurations from a custom TM_Server object
Continue of major refactoring of TM_Xml_Database
  - For example now the TM_Xml_Database ctor does not trigger a full data load (when in UsingFileSystem mode)
  - TM data loaded is now mostly at TM_XmlDatabase/TM_Xml_Database.Config.cs
This version does not load all libraries (but the main UI and Userdata should load)
Removed TMConfig.config file form the web root
Removed quite a bit of code (for features that are not neeed anymore)
  - For example the UserData 'FirstScript to invoke' feature
Refactored a number of string values into the TMConsts.cs class
Fixed ContextType bug in 'TM is Unavailable' page
Added a new type of Events class for the TM_Xml_Database
Lots of new tests to cover changes made (note that are 57 currently breaking (due to the fact that libraries are not being loaded)
minor .sln and TM_UserData fix