update
Merge branch 'master' of https://github.com/paulsutcliffe/lainonrails4

* 'master' of https://github.com/paulsutcliffe/lainonrails4:
  images on pages
  front end db connections
  front end db connections
  fixes

Conflicts:
	app/views/inicio/index.html.haml
	app/views/layouts/_navigation_links.html.haml
update all