Update.
Merge branch 'master' of http://github.com/ocrespo/VNCpp.git

Conflicts:
	VNCpp/src/es/farfuteam/vncpp/controller/CanvasActivity.java