add new articles

Change-Id: I48e3271fa598c0727012086cf3c810c6375d77e4
update build options for handling two templates

Change-Id: I4a7c986bb882ed6cd6ca702f69103e65125133cf