update templates
update js for conditionals on same page
update controller
Merge branch 'develop' of github.com:WebTales/rubedo into develop