updating query and new path organization
Merge branch 'master' of https://github.com/formaweb/rails-template

Conflicts:
	app/assets/stylesheets/globals/mixins.scss
	schema.rb