ajax loader better
Merge branch 'master' of github.com:brownie3003/fashion

Conflicts:
	public/javascripts/client.js