840PMCommitApril9
Merge branch 'edgarSandovalBranch' of https://github.com/justkeating/jigsaw.git into edgarSandovalBranch

Conflicts:
	.classpath
	.project
	AndroidManifest.xml
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/values/strings.xml