session_1.6
Merge branch 'master' of https://github.com/ricardosousa1989/Java_Android

Conflicts:
	workspace/HelloWorld/src/Application/HelloWorld.java