Leverage
Merge branch 'master' of github.com:leveragesystems/leverage_api

Conflicts:
	LeverageApi.v11.suo
	LeverageApi/bin/LeverageApi.dll
	LeverageApi/bin/LeverageApi.pdb
	LeverageApi/obj/Debug/LeverageApi.csprojResolveAssemblyReference.cache
	LeverageApi/obj/Debug/LeverageApi.dll
	LeverageApi/obj/Debug/LeverageApi.pdb
bin stuff
Merge branch 'master' of github.com:leveragesystems/leverage_api

Conflicts:
	LeverageApi.v11.suo
	LeverageApi/App_Data/api.mdf
	LeverageApi/App_Data/api_log.ldf
	LeverageApi/LeverageApi.csproj
	LeverageApi/bin/LeverageApi.dll
	LeverageApi/bin/LeverageApi.pdb
	LeverageApi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LeverageApi/obj/Debug/LeverageApi.csproj.FileListAbsolute.txt
	LeverageApi/obj/Debug/LeverageApi.csprojResolveAssemblyReference.cache
	LeverageApi/obj/Debug/LeverageApi.dll
	LeverageApi/obj/Debug/LeverageApi.pdb