fixed template and deselection when creating new feature
fixing magikHours directive
Merge branch 'master' into deploy