use question like directive and not like template
Merge branch 'master' of https://github.com/Factor-X/awac
Merge branch 'master' of https://github.com/Factor-X/awac
change client to period.key
resolve conflit