Add sample code into Eclipse project
Fix add sample into eclipse project
Merge branch 'master' of https://github.com/tproenca/guacaloco.git

Conflicts:
	guacaloco/META-INF/MANIFEST.MF
	guacaloco/src/guacaloco/views/GuacalocoView.java