BLUE - edit from live
Merge branch 'master' of /home/tice/workplace/gitonline/trymirror/nearonline_mirror

Conflicts:
	fileA
BLUE - manually fix merge conflict

from simul home/live updates