Messages model and calls children
Merge branch 'master' of git://github.com/jcabotc/centro_negocios

Conflicts:
	app/models/user.rb
	app/views/users/show.html.haml
	db/schema.rb
	spec/spec_functions.rb