pulled bad copy
Merge branch 'master' of https://github.com/walkerart/screens_admin

Conflicts:
	source/partials/_wac_modal.html.haml