Re #34 Moving node tpl to correct directory
Merge branch '7.x-4.x-form_cleanup_reference' into 7.x-4.x-admin_interface_phase2