usemin files
Merge branch 'master' into socketio

Conflicts:
	public/index.html