Framework & overrides
Merge branch 'master' of https://github.com/nyabb/poc

Conflicts:
	app/assets/stylesheets/framework_and_overrides.css.scss
GFlash