Put back in the blocks for Advanced Settings.

Remove secrets from master

Rc/2013 05 29, merging into release after adding release-2013-05-29 tag

Give all response types an id attribute.  CustomResponse had one, with a silly name.  Use it for all ResponseTypes.

Hotfix for 2013-05-28

Conflicts:
	requirements/edx/github.txt

Added tests for capa input templates (unescaped HTML)

updated mitxmako README to clarify license and origin

updated pinning icons

fix footer and header spacing/margin issues

Bug/christina/preview url

Reviewed by cale and brian (https://rbcommons.com/s/edx/r/3/)

lms/mktg - removes margins from social icons and reinstates flex-gutter margin to colophon area of footer

According to someone from Datadog, this was generating tags like "knowledgeable_
people_who_put_this_course_together._this_is_harvard._you_can_t_tell_us_there_s_
a_shortage_of_editorial_talent." They say that they can handle tens or hundreds
of unique tags but not thousands. Given that we have a unique URL for each
thread, we can't even use that as a tag. Thus, all tags are removed for now
until we can determine whether there is a useful set of tags with small enough
cardinality. In light of this, I did not investigate why the long tag mentioned
above was being generated.

Feature/vik/oe editor

Updated testing documentation to reflect changes to how requirements are

Removed old icon references and files

randomize_module.py was missing 'import lxml' to support definition_to_x...