Added annotations and new custom element
Changed from article to span and moved templates into custom element.
Added variable annotations and setter parameter annotations
Added annotations to parameters and typedefs
Fixed missed merge additions
Fixed unnecessary initialization