synced with linode prod
Merge branch 'multiple-users' of https://github.com/columbiagsapp/tutorials.gsapp.org into multiple-users

Conflicts:
	sites/all/modules/hallo_image_upload/hallo_image_upload.module
	sites/all/themes/.DS_Store
	sites/all/themes/gsapp_tutorials/css/tutorials.less
	sites/all/themes/gsapp_tutorials/js/app.js
	sites/all/themes/gsapp_tutorials/templates/node--course.tpl.php
ignores