Requirement django 1.5
Merge branch 'master' of github.com:sshwsfc/xadmin-demo

Conflicts:
	requirements.txt