doing
Merge branch '2.0-stable' into 2.0-dev
rm start.sh
Merge branch '2.0-stable' into 2.0-dev

Conflicts:
	addons/zfr.py
	code.py
Merge branch '2.0-stable' into 2.0-dev
new index ok
only icon left
new css ok
bf merg to stable
df deploy
Merge branch '2.0-stable' of github.com:zhwei/gotit into 2.0-stable