11
11
Sample without templates merging
Sample
image upload
image upload
Merge branch 'lsy' of https://github.com/Genting/django-genting into lsy

Conflicts:
	db.sqlite3
czc