robots change
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
automatic merge went well
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC

Conflicts:
	application/modules/shop
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
Merge remote-tracking branch 'origin/development' into RC
dev to RC
fix
fix
front
front