Add extra apps first

This allows the extra apps to override templates in the main repository
Merge pull request #697 from ahinz/fix/app-order

Add extra apps first