merge for friend with timeline
Merge branch 'dev' of https://github.com/ShinJJang/Podium into dev

Conflicts:
	Maple/api.py
Registration Page Completed / Profile View Created
add noti_friend and friendship
Getting User Picture API Implemented
Merge branch 'ux' into dev
Merge branch 'dev' into ux
chatting hide, show function add
User Profile Picture
Merge branch 'dev' of https://github.com/ShinJJang/Podium into dev
Merge branch 'dev' into ux
Friendship Implementation & UI Fix
Merge branch 'ux' into dev
합치자 태건아
go go g oo
css z-index modified
for merge
Merge branch 'dev' of https://github.com/ShinJJang/Podium into dev
Merge branch 'feature_post' of https://github.com/ShinJJang/Podium into dev

Conflicts:
	templates/_base.html
Resolves Conflicts