Updated app template devise generation order
Merge branch 'v1.1.0'