编写将数据转换为unicode的方法1 @work 2014-3-17 下午
Ôݴæ
temp
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/workspace.xml
	EnvMonitor/__init__.pyc
	EnvMonitor/settings.pyc
	company/function/string.py
	test.py
1.将url分到各个app中
2.加入south
3.在change list加入显示县区，当日小时报表等功能