change jre to 1.6
Merge branch 'master' of github.com:mattibal/meshnet

Conflicts:
	MeshNetBase/.classpath