add buildlocation
Merge remote-tracking branch 'origin/master'

Conflicts:
	transport/admin.py
Merge branch 'master' of https://github.com/sunfei7777/dlsPro