Add of TaskList
alan
-Add of TaskList Activity/Layout
a
-TaskList added
Merge branch 'pepain' of https://github.com/ddeleon93/Proyecto-Android into pepain

Conflicts:
	ProjectManager/bin/classes/com/projectmanager/FullscreenActivity.class
	ProjectManager/bin/classes/com/projectmanager/NewProject.class
	ProjectManager/bin/classes/com/projectmanager/NewTask.class
	ProjectManager/bin/classes/com/projectmanager/ProjectListViewAdapter.class
	ProjectManager/bin/classes/com/projectmanager/Projects$5.class
	ProjectManager/bin/classes/com/projectmanager/Projects.class
	ProjectManager/bin/classes/com/projectmanager/R$id.class
	ProjectManager/bin/classes/com/projectmanager/R$layout.class
	ProjectManager/bin/classes/com/projectmanager/R$menu.class
	ProjectManager/bin/classes/com/projectmanager/R$string.class
	ProjectManager/bin/classes/com/projectmanager/R$style.class
	ProjectManager/bin/classes/com/projectmanager/R$styleable.class
	ProjectManager/bin/classes/com/projectmanager/SplashScreen.class
	ProjectManager/bin/classes/com/projectmanager/Task.class
	ProjectManager/gen/com/projectmanager/R.java
a
-TaskList activity 80% completed
	-TODO:
	-Receive projectID on the intent from Projects.class
	-Send projectID to the NewTask.class
Modificaciones a layouts y validacion de busqueda nula
12:11
12:19
Merge remote-tracking branch 'origin/pepain' into david

Conflicts:
	ProjectManager/bin/classes/com/projectmanager/FullscreenActivity.class
	ProjectManager/bin/classes/com/projectmanager/NewProject.class
	ProjectManager/bin/classes/com/projectmanager/NewTask.class
	ProjectManager/bin/classes/com/projectmanager/ProjectListViewAdapter.class
	ProjectManager/bin/classes/com/projectmanager/Projects$5.class
	ProjectManager/bin/classes/com/projectmanager/Projects.class
	ProjectManager/bin/classes/com/projectmanager/R$id.class
	ProjectManager/bin/classes/com/projectmanager/R$layout.class
	ProjectManager/bin/classes/com/projectmanager/R$menu.class
	ProjectManager/bin/classes/com/projectmanager/R$string.class
	ProjectManager/bin/classes/com/projectmanager/R$style.class
	ProjectManager/bin/classes/com/projectmanager/R$styleable.class
	ProjectManager/bin/classes/com/projectmanager/SplashScreen.class
	ProjectManager/bin/classes/com/projectmanager/Task.class
	ProjectManager/gen/com/projectmanager/R.java
	ProjectManager/res/layout/activity_task.xml
Modificacion de detalles del layout
DeleteProjectDialog implemented
-Task List completed
Done:
-Pass intent with projectID from Projects.class -> TaskList.class ->
NewTask.class
-Add of cancel search in Projects and TaskList
DeleteProjectDialog implemented
Merge remote-tracking branch 'origin/pepain' into david

Conflicts:
	ProjectManager/bin/ProjectManager.apk
	ProjectManager/bin/classes.dex
	ProjectManager/bin/classes/com/projectmanager/ContentTask.class
	ProjectManager/bin/classes/com/projectmanager/Projects$1.class
	ProjectManager/bin/classes/com/projectmanager/Projects$2.class
	ProjectManager/bin/classes/com/projectmanager/Projects$3.class
	ProjectManager/bin/classes/com/projectmanager/Projects$4.class
	ProjectManager/bin/classes/com/projectmanager/Projects$5.class
	ProjectManager/bin/classes/com/projectmanager/Projects.class
	ProjectManager/bin/classes/com/projectmanager/TasksList.class
	ProjectManager/bin/classes/com/projectmanager/database/ProjectOperations.class
	ProjectManager/bin/resources.ap_
	ProjectManager/src/com/projectmanager/Projects.java
...
Merge remote-tracking branch 'origin/pepain' into david
Tasks-Lists edit icon changed
Image capture feature added
Search query improved