Merge branch 'master' of github.com:ijse/anthTrigger into socketio

Conflicts:
	public/index.html
connect to fr
Merge branch 'socketio' of github.com:ijse/anthTrigger into socketio

Conflicts:
	public/index.html
	public/page/app.js