file, chat Test
Merge branch 'dev' of https://github.com/ShinJJang/Podium into dev

Conflicts:
	Maple/models.py
	Maple/views.py