update for django 1.5
Merge branch 'master' of github.com:upTee/upTee

Conflicts:
	uptee/templates/new_design/mod/server_detail_info.html