changed
Merge branch 'master' of github.com:wh00527/ausos

Conflicts:
	app/etc/local.xml
new modules redis