Update
Merge branch 'master' of https://github.com/CaoManhDat/smartmusic

Conflicts:
	smartmusic/models.py