프렌드쉽 추가하는중...
프렌드쉽 추가하는중
friendship api add but javascript none.....
Merge remote-tracking branch 'origin/ux' into dev

Conflicts:
	Maple/api.py
	Podium/urls.py
plz merge youngmin~
post polling end. comment just added.
Merge remote-tracking branch 'origin/dev' into feature_post
merge로 날아간 FriendPostResource 복구 및 추가
merge for friend with timeline
Merge branch 'dev' of https://github.com/ShinJJang/Podium into dev

Conflicts:
	Maple/api.py
add noti_friend and friendship
Merge branch 'ux' into dev
Merge branch 'dev' into ux