Fix for option_select helper throwing error
Fixing mapping counts and visibility delay, allowing progress in defer_render
Merge branch 'feature/canjs-2.0' into brad

Conflicts:
	src/ggrc/assets/javascripts/mustache_helper.js