Merging

Gemfile.lock

app/controllers/aspects_controller.rb

app/models/aspect.rb

app/models/user.rb

app/views/albums/index.html.haml

app/views/devise/mailer/invitation.html.haml

app/views/js/_websocket_js.haml

app/views/photos/show.html.haml

app/views/status_messages/show.html.haml

ci.sh

cruise_config.rb

lib/cruise/build.rb

lib/tasks/cruise.rake

public/javascripts/view.js

public/stylesheets/sass/application.sass

spec/models/aspect_spec.rb

spec/models/comment_spec.rb

spec/models/user/receive_spec.rb

spec/models/user_spec.rb