free form text editor.
Merge branch 'master' of https://github.com/triqi/pet

Conflicts:
	Pet/Pet.Web/App_Data/aspnet-Pet.Web-20130928130855.mdf
	Pet/Pet.Web/App_Data/aspnet-Pet.Web-20130928130855_log.ldf
	Pet/Pet.Web/bin/Pet.Web.dll
	Pet/Pet.Web/bin/Pet.Web.pdb
	Pet/Pet.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Pet/Pet.Web/obj/Debug/Pet.Web.csprojResolveAssemblyReference.cache
	Pet/Pet.Web/obj/Debug/Pet.Web.dll
	Pet/Pet.Web/obj/Debug/Pet.Web.pdb
	Pet/Pet.v11.suo