Merge branch 'development' into admin_withdraw_request

Conflicts:
	spec/features/dashboard_spec.rb
add gemfile lock
fix spec after merge
Merge pull request #137 from WGBH/admin_withdraw_request

Admin withdraw request
fix merge conflict