share , like facebook and twitter
Merge branch 'master' of https://github.com/ngotuan12/ASEProject
CuongNM update
Merge branch 'master' of https://github.com/ngotuan12/ASEProject

Conflicts:
	myapp/models/UserProfile.py
Merge branch 'master' of https://github.com/ngotuan12/ASEProject
CuongNM