Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb

@@ -7,7 +7,7 @@ Hi <%= @user.first_name %>,
 <% link_style = "background-color:#ED3618; margin:0px 8px 0px 8px; border: solid 1px #F27861; outline: solid 2px #ED3618; padding:3px 10px; font-family:Raleway, Arial, Helvetica, sans-serif; font-size:12px; font-weight:300; cursor:pointer; color:#FC9; text-decoration:none;" %>
 <p>
 <table bgcolor="#242323" cellpadding="3px" cellspacing="5px">
-<% @new_nearby.each do |user| %>
+<% @new_musicians.each do |user| %>
   <tr valign="top">
     <td width="10%"><img src="http://<%= @host %>/assets/shared/avatar_generic.png" /></td>
     <td width="20%"><font color="#ccc"><%= user.name %><br />

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb

@@ -1,10 +1,10 @@
-New JamKazam Musicians in your Area
+New Musicians You Should Check Out
 
 Hi <%= @user.first_name %>,
 
 The following new musicians have joined JamKazam within the last week, and have Internet connections with low enough latency to you that you can have a good online session together. We'd suggest that you look through the new musicians listed below to see if any match your musical interests, and if so, click through to their profile page on the JamKazam website to send them a message or a request to connect as a JamKazam friend:
 
-<% @new_nearby.each do |user| %>
+<% @new_musicians.each do |user| %>
 <%= user.name %> (http://<%= @host %>/client#/profile/<%= user.id %>)
   <%= user.location %>
   <% user.instruments.collect { |inst| inst.description }.join(', ') %>