3/4일자 수정사항 반영
Merge branch 'master' of github.com:Plulena/kidsm_for_android

Conflicts:
	MySlidingProject/res/layout/activity_mentory_notparent.xml
	MySlidingProject/res/layout/activity_mentory_parent.xml
	MySlidingProject/src/com/ihateflyingbugs/kidsm/mentory/MentoryFragment.java