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
front
Merge branch 'development' of github.com:imagecms/ImageCMS into development
fix
fix
04_06_13_1
fix