first init
merge .net and extjs
Merge branch 'master' of github.com:skygreen2001/betterlife.net

Conflicts:
	.gitignore