clickthelogo
Merge remote-tracking branch 'origin/master'

Conflicts:
	LeisnerWebApp/LeisnerWebApp.v11.suo
	LeisnerWebApp/LeisnerWebApp/bin/LeisnerWebApp.dll
	LeisnerWebApp/LeisnerWebApp/bin/LeisnerWebApp.pdb

	LeisnerWebApp/LeisnerWebApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LeisnerWebApp/LeisnerWebApp/obj/Debug/LeisnerWebApp.dll
	LeisnerWebApp/LeisnerWebApp/obj/Debug/LeisnerWebApp.pdb

	LeisnerWebApp/LeisnerWebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/Flowrin/LeisnerWebApplication