conflict resolution ftw
Merge branch 'master' of http://github.com/jorgvm/Fubar

Conflicts:
	stylesheets/shared-components/_forms.scss
Merge branch 'master' of http://github.com/jorgvm/Fubar

 especially if it merges an updated upstream into a topic branch.
testing done, cleanup