added template choose and switch logic
Merge branch 'master' of https://github.com/ziqbal/ae-kaufmann.com