annotation done
Merge branch 'master' into member

fixed Conflicts:
	app/assets/javascripts/home.js
	app/assets/stylesheets/application-all.css.scss