Merge branch 'master' of https://github.com/jonasoesch/NRJ

Conflicts:
	NRJdroid/.classpath
	NRJdroid/project.properties