last merge conflicts fixed
login process added
Sing Up verify methods changed
Merge branch 'oscar' into developer

Conflicts:
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$drawable.class
Merge branch 'developer' into alexis

Conflicts:
	WeMake/res/layout/activity_register_part_tree.xml
	WeMake/res/layout/activity_register_part_two.xml
	WeMake/src/co/gov/wemake/wemakeapp/activities/RegisterActivity.java