Fixing the folder restructure in GitHub
Merge remote-tracking branch 'origin/master'

Conflicts:
	CloudPanel/Bootstrapper.cs
	CloudPanel/CloudPanel.csproj
	CloudPanel/Properties/AssemblyInfo.cs
	CloudPanel/RazorConfig.cs
	CloudPanel/UserMapper.cs
	CloudPanel/Web.config
	CloudPanel/code/AuthenticatedUser.cs
	CloudPanel/code/CPHtmlHelpers.cs
	CloudPanel/config/settings.xml
	CloudPanel/content/js/bootstrap.js
	CloudPanel/content/js/bootstrap.min.js
	CloudPanel/content/js/jquery-1.10.2.min.js
	CloudPanel/content/less/variables.less
	CloudPanel/modules/CompaniesModule.cs
	CloudPanel/modules/DashboardModule.cs
	CloudPanel/modules/ResellersModule.cs
	CloudPanel/packages.config
	CloudPanel/views/companies.cshtml
	CloudPanel/views/error.cshtml
	CloudPanel/views/login.cshtml
	CloudPanel/views/resellers.cshtml