changes in showActivity. now showing in mainscreen
Merge branch 'master' of https://github.com/euniciaruiz/activityTracker

Conflicts:
	platforms/android/CordovaLib/bin/activitytracker-cordovalib.jar
	platforms/android/bin/R.txt
	platforms/android/bin/classes/com/project/activityTracker/ActivityTracker.class
	platforms/android/bin/classes/com/project/activityTracker/R$id.class
	platforms/android/bin/classes/com/project/activityTracker/R$layout.class
	platforms/android/bin/classes/com/project/activityTracker/R$menu.class
	platforms/android/bin/classes/com/project/activityTracker/R$string.class
	platforms/android/bin/classes/com/project/activityTracker/R$style.class
	platforms/android/bin/classes/com/project/activityTracker/R$xml.class
	platforms/android/bin/classes/com/project/activityTracker/ShowActivity.class
	platforms/android/bin/classes/com/project/db/DatabaseHelper.class
	platforms/android/gen/com/project/activityTracker/R.java
	platforms/android/res/values/strings.xml
	platforms/android/src/com/project/activityTracker/ActivityTracker.java
	platforms/android/src/com/project/activityTracker/ShowActivity.java
	platforms/android/src/com/project/db/DatabaseHelper.java