Merge branch 'master' of github.com:MeterSoft/my_net

Conflicts:
	app/controllers/messages_controller.rb
	config/private_pub.yml