Evaluation v2
	- has functions for passing data to narration module.
	- also has functions for updating the database BUT IT DOESN'T WORK
	- finally able to pass the USER ID
		- have to slightly edit main activity, map activity abstract
			tutorial and abstract lesson activity to get the userID
Returns Questions made from 30 days

Fixed: UserRecordOperations class
Merge remote-tracking branch 'origin/test'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/SalinlahiFour.apk
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/ube/adapters/LoginAdapter.class
	bin/classes/com/ube/salinlahifour/Lesson.class
	bin/classes/com/ube/salinlahifour/LessonItemLoader.class
	bin/classes/com/ube/salinlahifour/LoginActivity.class
	bin/classes/com/ube/salinlahifour/MainActivity$1.class
	bin/classes/com/ube/salinlahifour/MainActivity.class
	bin/classes/com/ube/salinlahifour/MapActivity.class
	bin/classes/com/ube/salinlahifour/R$id.class
	bin/classes/com/ube/salinlahifour/R$integer.class
	bin/classes/com/ube/salinlahifour/R$layout.class
	bin/classes/com/ube/salinlahifour/R$menu.class
	bin/classes/com/ube/salinlahifour/R$string.class
	bin/classes/com/ube/salinlahifour/R$style.class
	bin/classes/com/ube/salinlahifour/R$styleable.class
	bin/classes/com/ube/salinlahifour/R$xml.class
	bin/classes/com/ube/salinlahifour/RegistrationActivity.class
	bin/classes/com/ube/salinlahifour/debugclasses/DebugUserModuleActivity.class
	bin/classes/com/ube/salinlahifour/debugclasses/DebugUserModuleAdapter.class
	bin/classes/com/ube/salinlahifour/debugclasses/DebugUserRecordActivity.class
	bin/classes/com/ube/salinlahifour/lessonActivities/AbstractLessonActivity.class
	bin/classes/com/ube/salinlahifour/lessonActivities/Cooking.class
	bin/classes/com/ube/salinlahifour/lessonActivities/Family.class
	bin/classes/com/ube/salinlahifour/lessonActivities/House.class
	bin/classes/com/ube/salinlahifour/lessonActivities/Society.class
	bin/classes/com/ube/salinlahifour/tutorials/Cooking.class
	bin/classes/com/ube/salinlahifour/tutorials/Family.class
	bin/classes/com/ube/salinlahifour/tutorials/House.class
	bin/classes/com/ube/salinlahifour/tutorials/Music.class
	bin/dexedLibs/android-support-v4-84e70fe7bf42975c09a4cf25cf397eb5.jar
	bin/dexedLibs/android-support-v7-appcompat-67f3a3ad503a06299f1a7d3c01059a04.jar
	bin/dexedLibs/appcompat_v7_4-7d2e3a8b9bf2ac52af6a96370523ec24.jar
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/ube/salinlahifour/R.java
	src/com/ube/salinlahifour/MainActivity.java
	src/com/ube/salinlahifour/tutorials/Music.java
Updated theme in Android Manifest

Pagalitan niyo nalang ako kung mali pagkakamerge ko
Evaluation v2
	Have functions for passing data to narration
	Have functions for passing data to the user library(not working
currently, problems with the db)
before merging
before the merge
With raiza's assets for splash screen, map(w/ icons for implemented
lessons) and Register User
quick fix... (tama na yung gender sa confirmation and lahat ng buildings
nasa map accdg to raiza's design)
working widget on map
Evaluation v3 passing data to user library and iFeedback
Evaluation V4 updated updateUserLessonProgress Function
before the merge
Fixed Cooking Lesson Activity

Choices doesn't repeat anymore. Set this as an example in Family Lesson
Activity's setChoice(), but I guess it's too late for that now!
:panda_face:
Uhhhhhh Fixed narration... please check... and Game 1 clutters
also add raiza's Difficulty assets and End game report assets
Merged with master
I has game 2
before merge
before merge with joyce
merged