Merge pull request #1 from georgefs/master

hello
v1 version
SCSS
fix conflict and api
fix
fix
接 chart api
update fake api
Merge branch 'master' of github.com:dreamline2/george

Conflicts:
	main.py
	main.pyc
	views/apis.py
update field name
loading
loading componment
fix conflict
圖片
add logout api
Merge branch 'master' of github.com:dreamline2/george
fix
新API
solve conflict & include 瀑布流
fix