Insert synchronization oofline/online across several clients
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/index.jsp