Fix problem with showIf
Minor fixes
Add test for simple case
Add test for subschema case and make it work
Make conditionals based on name, not id
Merge branch 'test-showif' into dev

Conflicts:
	app/js/controllers/base.js
Merge branch 'test-showif' into dev

Conflicts:
	app/js/controllers/base.js