Merge branch 'master' of https://github.com/MentoSchool/skincare.git

Conflicts:
	Collage_GoddessOfSkin-prototype/src/com/collage/goddessofskin/prototype/fragment/settings/FragSettingsProfile.java
Merge branch 'master' of https://github.com/MentoSchool/skincare.git