error founded trying to fixed
Merge
Merge branch 'oscar' into developer

Conflicts:
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$attr.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$dimen.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$drawable.class
	WeMake/res/layout/activity_register_part_tree.xml
	WeMake/res/layout/activity_register_part_two.xml
	WeMake/res/values/strings.xml
	WeMake/src/co/gov/wemake/wemakeapp/activities/RegisterActivity.java
	WeMake/src/co/gov/wemake/wemakeapp/controller/RegisterController.java
merge conflict on registercontroller fixed
last merge conflicts fixed
Merge branch 'oscar' into developer

Conflicts:
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$drawable.class
Merge branch 'oscar' into developer
files changed
Merge branch 'oscar' into developer
Merge branch 'developer' of https://github.com/ReyesMagos/WeMakeApp into developer
profile picture change dinamically