including new benefits and fix some little bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	css/style.sass
version 2