cuda: update Makefile
cuda: merge master, and update Makefile
Merge remote-tracking branch 'origin/gdev-axe'

Conflicts:
	cuda/libucuda/Makefile
Merge remote-tracking branch 'origin/gdev-axe'