Merge pull request #525 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #529 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #530 from AgileVentures/staging

Pushing Staging to Production
Merge pull request #532 from AgileVentures/develop

Pushing BUG FIX: Memory quota exceeded to Staging
Merge pull request #533 from AgileVentures/staging

Pushing BUG FIX: Memory quota exceeded to Production/Master
Merge pull request #536 from AgileVentures/develop

Pushing Develop to Staging
cuke is passing. Added 'WaitForAjax' module in helpers.rb. Minor change in '_members_list.html.erb'
Merge pull request #540 from AgileVentures/develop

Pushing Develop to Staging
added specs to 'views/projects/show.html.erb_spec'
WIP - working on specs for 'mercury_update' in 'projects_controller_spec.rb'
Merge pull request #553 from AgileVentures/staging

Pushing Staging to Production
Replaced Unicorn with Puma Web Server
Merge pull request #554 from sampritipanda/puma

Thx Sampriti!
refactored step_defs and updated 'projects_show'
Merge pull request #555 from tochman/projects_description_editor

Patch - Projects description editor
Merge pull request #556 from AgileVentures/develop

Pushing develop to staging
Merge pull request #557 from AgileVentures/staging

Pushing Staging to Production
added 'video-container' css class and wrapped yt players with a div with that class. Added a wrapper to mercury when inserting yt file
locked IceCube gem to v0.11.1
restriced ApplicationController before_filter to non-xhr requests