a
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
12:11
12:19
...