Merge branch 'issue-72' into staging
[issue #72]

- se agrego media query para alinear en 3 columnas las secciones de la home y portfolio para ipad

Conflicts:

	app/assets/stylesheets/_base.css.scss
Merge branch 'issue-72-correct' into staging

Conflicts:
	app/assets/stylesheets/_base.css.scss
Merge branch 'issue-47' into staging
Merge branch 'staging' of github.com:insignia4u/i4u into issue-72
Merge branch 'issue-72' into staging
Merge branch 'issue-91' into staging
Merge branch 'issue-54' into staging
Merge branch 'issue-59' into staging
Merge branch 'issue-60' into staging
Merge branch 'issue-88' into staging
Merge branch 'issue-88' into staging
[Issue #87 - Remove required file to job message]
Merge branch 'issue-87' into staging
Merge branch 'issue-68' into staging
Merge branch 'issue-58' into staging
Merge branch 'issue-58' into staging
Merge branch 'issue-92' into staging
[Refactoring] Improve sample images load

Conflicts:

	db/seeds.rb
	lib/populator/featured_contents.rb
	lib/populator/people.rb
	lib/populator/projects.rb
[Spec Coverage] Add spec for ErrorsDecorators