Update template.rb
fixes
gem upd
Update news.rb
Update mongoid.rb
fixes
fix slug concern for AR
fix typo in template
fix menu for AR
fix for mongoid
Update new_message_email.html.haml
Merge remote-tracking branch 'upstream/master'
sync; fixes for this repo

Conflicts:
	Gemfile.lock
	lib/manual_slug/mongoid.rb
	lib/rocket_cms/models/menu.rb
	lib/rocket_cms/models/mongoid/page.rb