soundcloud in progress
Merge branch 'present-dev' into Eric_Branch
Testing The merge on my branch instead of the present branch
Conflicts:
	app/controllers/users/users.integrations.server.controller.js
	app/routes/users.server.routes.js
	public/modules/users/views/integrations.client.view.html