Merge branch 'dev' into ux
Date Widget Implemented
Merge branch 'dev' into ux
Add Registration Template
프렌드쉽 추가하는중...
프렌드쉽 추가하는중
Merge branch 'feature_post' into ux
friendship api add but javascript none.....
Merge remote-tracking branch 'origin/ux' into dev

Conflicts:
	Maple/api.py
	Podium/urls.py
plz merge youngmin~
Merge remote-tracking branch 'origin/dev' into feature_post
merge로 날아간 FriendPostResource 복구 및 추가