elimando carpetas
incorporando aspnet
Merge branch 'master' of github.com:cherryweb/web

Conflicts:
	cherryWeb/cherryWeb.suo