Merge branch 'ticket-56' into staging
[Ticket #84 - Update gemfile]

 - Delete empty specs.
[Ticket #84 - Add specs to AttachmentFile and Site  models]
[Ticket #84 - Resolve spec to TextSnippet model]
[Ticket #84 - Resolve specs to Person and Project models]
[fixes - arreglos generales]
[revision general para tablet y smartphones]

- se resolvieron los tt y se reviso el sitio en diferentes resoluciones
[fix css]

- se corrigieron mediaquerys para la resolucion de 800px
[Ticket #84 - Update specs]
[Ticket #85 - Limit the use of memcache only staging and production]
Merge branch 'ticket-85' into staging
[Issue #36 change subscription message]
[Ticket #84 - Update specs to Jobs controller]
[Ticket #84 - update specs]
Merge branch 'ticket-84' into staging

Conflicts:
	config/environments/development.rb
	config/initializers/session_store.rb
Merge branch 'staging' of github.com:insignia4u/i4u into staging
Merge branch 'css-fix' into staging

Conflicts:
	app/views/projects/index.html.slim
[Ticket #84 - Update gemfile]

 - Delete empty specs.
[Ticket #84 - Add specs to AttachmentFile and Site  models]
[Ticket #84 - Resolve spec to TextSnippet model]