Fixing resource copy
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Fixing no reference to ImageControl.o in linkedition step
Merge pull request #893 from Joilnen/next

Fixing cmake file