Back to PlayFramework 2.1.1 (previously 2.2-SNAPSHOT).
--amend
Renamed package com.taig.tmpltr to com.taig.play.tmpltr.
Updated deploy script due to changed package declarations.
Merge branch 'master' of https://github.com/Taig/Play-Tmpltr

Conflicts:
	app/com/taig/tmpltr/Attributes.scala
	app/com/taig/tmpltr/HtmlNode.scala
	app/com/taig/tmpltr/Property.scala
	app/com/taig/tmpltr/Tag.scala
	app/com/taig/tmpltr/engine/bootstrap/button.scala
	app/com/taig/tmpltr/engine/bootstrap/caret.scala
	app/com/taig/tmpltr/engine/bootstrap/container.scala
	app/com/taig/tmpltr/engine/bootstrap/lead.scala
	app/com/taig/tmpltr/engine/bootstrap/page_header.scala
	app/com/taig/tmpltr/engine/bootstrap/property/button.scala
	app/com/taig/tmpltr/engine/html/a.scala
	app/com/taig/tmpltr/engine/html/abbr.scala
	app/com/taig/tmpltr/engine/html/address.scala
	app/com/taig/tmpltr/engine/html/area.scala
	app/com/taig/tmpltr/engine/html/article.scala
	app/com/taig/tmpltr/engine/html/aside.scala
	app/com/taig/tmpltr/engine/html/audio.scala
	app/com/taig/tmpltr/engine/html/b.scala
	app/com/taig/tmpltr/engine/html/base.scala
	app/com/taig/tmpltr/engine/html/bdo.scala
	app/com/taig/tmpltr/engine/html/blockquote.scala
	app/com/taig/tmpltr/engine/html/body.scala
	app/com/taig/tmpltr/engine/html/boilerplate.scala
	app/com/taig/tmpltr/engine/html/br.scala
	app/com/taig/tmpltr/engine/html/button.scala
	app/com/taig/tmpltr/engine/html/canvas.scala
	app/com/taig/tmpltr/engine/html/caption.scala
	app/com/taig/tmpltr/engine/html/cite.scala
	app/com/taig/tmpltr/engine/html/code.scala
	app/com/taig/tmpltr/engine/html/col.scala
	app/com/taig/tmpltr/engine/html/colgroup.scala
	app/com/taig/tmpltr/engine/html/datalist.scala
	app/com/taig/tmpltr/engine/html/dd.scala
	app/com/taig/tmpltr/engine/html/del.scala
	app/com/taig/tmpltr/engine/html/details.scala
	app/com/taig/tmpltr/engine/html/dfn.scala
	app/com/taig/tmpltr/engine/html/dialog.scala
	app/com/taig/tmpltr/engine/html/div.scala
	app/com/taig/tmpltr/engine/html/dl.scala
	app/com/taig/tmpltr/engine/html/doctype.scala
	app/com/taig/tmpltr/engine/html/dt.scala
	app/com/taig/tmpltr/engine/html/em.scala
	app/com/taig/tmpltr/engine/html/embed.scala
	app/com/taig/tmpltr/engine/html/fieldset.scala
	app/com/taig/tmpltr/engine/html/figcaption.scala
	app/com/taig/tmpltr/engine/html/figure.scala
	app/com/taig/tmpltr/engine/html/footer.scala
	app/com/taig/tmpltr/engine/html/form.scala
	app/com/taig/tmpltr/engine/html/h.scala
	app/com/taig/tmpltr/engine/html/h1.scala
	app/com/taig/tmpltr/engine/html/h2.scala
	app/com/taig/tmpltr/engine/html/h3.scala
	app/com/taig/tmpltr/engine/html/h4.scala
	app/com/taig/tmpltr/engine/html/h5.scala
	app/com/taig/tmpltr/engine/html/h6.scala
	app/com/taig/tmpltr/engine/html/head.scala
	app/com/taig/tmpltr/engine/html/header.scala
	app/com/taig/tmpltr/engine/html/hgroup.scala
	app/com/taig/tmpltr/engine/html/hr.scala
	app/com/taig/tmpltr/engine/html/html.scala
	app/com/taig/tmpltr/engine/html/i.scala
	app/com/taig/tmpltr/engine/html/iframe.scala
	app/com/taig/tmpltr/engine/html/img.scala
	app/com/taig/tmpltr/engine/html/input.scala
	app/com/taig/tmpltr/engine/html/ins.scala
	app/com/taig/tmpltr/engine/html/kbd.scala
	app/com/taig/tmpltr/engine/html/label.scala
	app/com/taig/tmpltr/engine/html/legend.scala
	app/com/taig/tmpltr/engine/html/li.scala
	app/com/taig/tmpltr/engine/html/link.scala
	app/com/taig/tmpltr/engine/html/map.scala
	app/com/taig/tmpltr/engine/html/mark.scala
	app/com/taig/tmpltr/engine/html/meta.scala
	app/com/taig/tmpltr/engine/html/meter.scala
	app/com/taig/tmpltr/engine/html/nav.scala
	app/com/taig/tmpltr/engine/html/noscript.scala
	app/com/taig/tmpltr/engine/html/obj.scala
	app/com/taig/tmpltr/engine/html/ol.scala
	app/com/taig/tmpltr/engine/html/optgroup.scala
	app/com/taig/tmpltr/engine/html/option.scala
	app/com/taig/tmpltr/engine/html/output.scala
	app/com/taig/tmpltr/engine/html/p.scala
	app/com/taig/tmpltr/engine/html/pre.scala
	app/com/taig/tmpltr/engine/html/progress.scala
	app/com/taig/tmpltr/engine/html/property/a.scala
	app/com/taig/tmpltr/engine/html/property/button.scala
	app/com/taig/tmpltr/engine/html/property/form.scala
	app/com/taig/tmpltr/engine/html/property/input.scala
	app/com/taig/tmpltr/engine/html/property/link.scala
	app/com/taig/tmpltr/engine/html/q.scala
	app/com/taig/tmpltr/engine/html/rp.scala
	app/com/taig/tmpltr/engine/html/rt.scala
	app/com/taig/tmpltr/engine/html/ruby.scala
	app/com/taig/tmpltr/engine/html/s.scala
	app/com/taig/tmpltr/engine/html/samp.scala
	app/com/taig/tmpltr/engine/html/script.scala
	app/com/taig/tmpltr/engine/html/section.scala
	app/com/taig/tmpltr/engine/html/small.scala
	app/com/taig/tmpltr/engine/html/span.scala
	app/com/taig/tmpltr/engine/html/strong.scala
	app/com/taig/tmpltr/engine/html/style.scala
	app/com/taig/tmpltr/engine/html/sub.scala
	app/com/taig/tmpltr/engine/html/summary.scala
	app/com/taig/tmpltr/engine/html/sup.scala
	app/com/taig/tmpltr/engine/html/table.scala
	app/com/taig/tmpltr/engine/html/tbody.scala
	app/com/taig/tmpltr/engine/html/td.scala
	app/com/taig/tmpltr/engine/html/tfoot.scala
	app/com/taig/tmpltr/engine/html/th.scala
	app/com/taig/tmpltr/engine/html/thead.scala
	app/com/taig/tmpltr/engine/html/time.scala
	app/com/taig/tmpltr/engine/html/title.scala
	app/com/taig/tmpltr/engine/html/tr.scala
	app/com/taig/tmpltr/engine/html/u.scala
	app/com/taig/tmpltr/engine/html/ul.scala
	app/com/taig/tmpltr/engine/html/variable.scala
	app/com/taig/tmpltr/engine/html/video.scala
	app/com/taig/tmpltr/engine/html/wbr.scala
	app/com/taig/tmpltr/markup/a.scala
	app/com/taig/tmpltr/markup/abbr.scala
	app/com/taig/tmpltr/markup/address.scala
	app/com/taig/tmpltr/markup/area.scala
	app/com/taig/tmpltr/markup/article.scala
	app/com/taig/tmpltr/markup/aside.scala
	app/com/taig/tmpltr/markup/audio.scala
	app/com/taig/tmpltr/markup/b.scala
	app/com/taig/tmpltr/markup/base.scala
	app/com/taig/tmpltr/markup/bdo.scala
	app/com/taig/tmpltr/markup/blockquote.scala
	app/com/taig/tmpltr/markup/body.scala
	app/com/taig/tmpltr/markup/br.scala
	app/com/taig/tmpltr/markup/button.scala
	app/com/taig/tmpltr/markup/canvas.scala
	app/com/taig/tmpltr/markup/caption.scala
	app/com/taig/tmpltr/markup/cite.scala
	app/com/taig/tmpltr/markup/code.scala
	app/com/taig/tmpltr/markup/col.scala
	app/com/taig/tmpltr/markup/colgroup.scala
	app/com/taig/tmpltr/markup/datalist.scala
	app/com/taig/tmpltr/markup/dd.scala
	app/com/taig/tmpltr/markup/del.scala
	app/com/taig/tmpltr/markup/details.scala
	app/com/taig/tmpltr/markup/dfn.scala
	app/com/taig/tmpltr/markup/dialog.scala
	app/com/taig/tmpltr/markup/div.scala
	app/com/taig/tmpltr/markup/dl.scala
	app/com/taig/tmpltr/markup/doctype.scala
	app/com/taig/tmpltr/markup/dt.scala
	app/com/taig/tmpltr/markup/em.scala
	app/com/taig/tmpltr/markup/embed.scala
	app/com/taig/tmpltr/markup/fieldset.scala
	app/com/taig/tmpltr/markup/figcaption.scala
	app/com/taig/tmpltr/markup/figure.scala
	app/com/taig/tmpltr/markup/footer.scala
	app/com/taig/tmpltr/markup/form.scala
	app/com/taig/tmpltr/markup/h.scala
	app/com/taig/tmpltr/markup/head.scala
	app/com/taig/tmpltr/markup/header.scala
	app/com/taig/tmpltr/markup/hgroup.scala
	app/com/taig/tmpltr/markup/hr.scala
	app/com/taig/tmpltr/markup/html.scala
	app/com/taig/tmpltr/markup/i.scala
	app/com/taig/tmpltr/markup/iframe.scala
	app/com/taig/tmpltr/markup/img.scala
	app/com/taig/tmpltr/markup/input.scala
	app/com/taig/tmpltr/markup/ins.scala
	app/com/taig/tmpltr/markup/kbd.scala
	app/com/taig/tmpltr/markup/keygen.scala
	app/com/taig/tmpltr/markup/label.scala
	app/com/taig/tmpltr/markup/legend.scala
	app/com/taig/tmpltr/markup/li.scala
	app/com/taig/tmpltr/markup/link.scala
	app/com/taig/tmpltr/markup/map.scala
	app/com/taig/tmpltr/markup/mark.scala
	app/com/taig/tmpltr/markup/meta.scala
	app/com/taig/tmpltr/markup/meter.scala
	app/com/taig/tmpltr/markup/nav.scala
	app/com/taig/tmpltr/markup/noscript.scala
	app/com/taig/tmpltr/markup/obj.scala
	app/com/taig/tmpltr/markup/ol.scala
	app/com/taig/tmpltr/markup/optgroup.scala
	app/com/taig/tmpltr/markup/option.scala
	app/com/taig/tmpltr/markup/output.scala
	app/com/taig/tmpltr/markup/p.scala
	app/com/taig/tmpltr/markup/param.scala
	app/com/taig/tmpltr/markup/pre.scala
	app/com/taig/tmpltr/markup/progress.scala
	app/com/taig/tmpltr/markup/q.scala
	app/com/taig/tmpltr/markup/rp.scala
	app/com/taig/tmpltr/markup/rt.scala
	app/com/taig/tmpltr/markup/ruby.scala
	app/com/taig/tmpltr/markup/s.scala
	app/com/taig/tmpltr/markup/samp.scala
	app/com/taig/tmpltr/markup/script.scala
	app/com/taig/tmpltr/markup/section.scala
	app/com/taig/tmpltr/markup/select.scala
	app/com/taig/tmpltr/markup/small.scala
	app/com/taig/tmpltr/markup/source.scala
	app/com/taig/tmpltr/markup/span.scala
	app/com/taig/tmpltr/markup/strong.scala
	app/com/taig/tmpltr/markup/style.scala
	app/com/taig/tmpltr/markup/sub.scala
	app/com/taig/tmpltr/markup/summary.scala
	app/com/taig/tmpltr/markup/sup.scala
	app/com/taig/tmpltr/markup/table.scala
	app/com/taig/tmpltr/markup/tbody.scala
	app/com/taig/tmpltr/markup/td.scala
	app/com/taig/tmpltr/markup/textarea.scala
	app/com/taig/tmpltr/markup/tfoot.scala
	app/com/taig/tmpltr/markup/th.scala
	app/com/taig/tmpltr/markup/thead.scala
	app/com/taig/tmpltr/markup/time.scala
	app/com/taig/tmpltr/markup/title.scala
	app/com/taig/tmpltr/markup/tr.scala
	app/com/taig/tmpltr/markup/u.scala
	app/com/taig/tmpltr/markup/ul.scala
	app/com/taig/tmpltr/markup/variable.scala
	app/com/taig/tmpltr/markup/video.scala
	app/com/taig/tmpltr/markup/wbr.scala
	app/com/taig/tmpltr/package.scala
	module/library/app/com/taig/play/tmpltr/Attributes.scala
	module/library/app/com/taig/play/tmpltr/HtmlNode.scala
	module/library/app/com/taig/play/tmpltr/Property.scala
	module/library/app/com/taig/play/tmpltr/Tag.scala
	module/library/app/com/taig/play/tmpltr/engine/bootstrap/button.scala
	module/library/app/com/taig/play/tmpltr/engine/bootstrap/caret.scala
	module/library/app/com/taig/play/tmpltr/engine/bootstrap/container.scala
	module/library/app/com/taig/play/tmpltr/engine/bootstrap/icon.scala
	module/library/app/com/taig/play/tmpltr/engine/bootstrap/lead.scala
	module/library/app/com/taig/play/tmpltr/engine/bootstrap/page_header.scala
	module/library/app/com/taig/play/tmpltr/engine/bootstrap/property/button.scala
	module/library/app/com/taig/play/tmpltr/engine/bootstrap/property/icon.scala
	module/library/app/com/taig/play/tmpltr/engine/html/a.scala
	module/library/app/com/taig/play/tmpltr/engine/html/abbr.scala
	module/library/app/com/taig/play/tmpltr/engine/html/address.scala
	module/library/app/com/taig/play/tmpltr/engine/html/area.scala
	module/library/app/com/taig/play/tmpltr/engine/html/article.scala
	module/library/app/com/taig/play/tmpltr/engine/html/aside.scala
	module/library/app/com/taig/play/tmpltr/engine/html/audio.scala
	module/library/app/com/taig/play/tmpltr/engine/html/b.scala
	module/library/app/com/taig/play/tmpltr/engine/html/base.scala
	module/library/app/com/taig/play/tmpltr/engine/html/bdo.scala
	module/library/app/com/taig/play/tmpltr/engine/html/blockquote.scala
	module/library/app/com/taig/play/tmpltr/engine/html/body.scala
	module/library/app/com/taig/play/tmpltr/engine/html/boilerplate.scala
	module/library/app/com/taig/play/tmpltr/engine/html/br.scala
	module/library/app/com/taig/play/tmpltr/engine/html/button.scala
	module/library/app/com/taig/play/tmpltr/engine/html/canvas.scala
	module/library/app/com/taig/play/tmpltr/engine/html/caption.scala
	module/library/app/com/taig/play/tmpltr/engine/html/cite.scala
	module/library/app/com/taig/play/tmpltr/engine/html/code.scala
	module/library/app/com/taig/play/tmpltr/engine/html/col.scala
	module/library/app/com/taig/play/tmpltr/engine/html/colgroup.scala
	module/library/app/com/taig/play/tmpltr/engine/html/datalist.scala
	module/library/app/com/taig/play/tmpltr/engine/html/dd.scala
	module/library/app/com/taig/play/tmpltr/engine/html/del.scala
	module/library/app/com/taig/play/tmpltr/engine/html/details.scala
	module/library/app/com/taig/play/tmpltr/engine/html/dfn.scala
	module/library/app/com/taig/play/tmpltr/engine/html/dialog.scala
	module/library/app/com/taig/play/tmpltr/engine/html/div.scala
	module/library/app/com/taig/play/tmpltr/engine/html/dl.scala
	module/library/app/com/taig/play/tmpltr/engine/html/doctype.scala
	module/library/app/com/taig/play/tmpltr/engine/html/dt.scala
	module/library/app/com/taig/play/tmpltr/engine/html/em.scala
	module/library/app/com/taig/play/tmpltr/engine/html/embed.scala
	module/library/app/com/taig/play/tmpltr/engine/html/fieldset.scala
	module/library/app/com/taig/play/tmpltr/engine/html/figcaption.scala
	module/library/app/com/taig/play/tmpltr/engine/html/figure.scala
	module/library/app/com/taig/play/tmpltr/engine/html/footer.scala
	module/library/app/com/taig/play/tmpltr/engine/html/form.scala
	module/library/app/com/taig/play/tmpltr/engine/html/h.scala
	module/library/app/com/taig/play/tmpltr/engine/html/h1.scala
	module/library/app/com/taig/play/tmpltr/engine/html/h2.scala
	module/library/app/com/taig/play/tmpltr/engine/html/h3.scala
	module/library/app/com/taig/play/tmpltr/engine/html/h4.scala
	module/library/app/com/taig/play/tmpltr/engine/html/h5.scala
	module/library/app/com/taig/play/tmpltr/engine/html/h6.scala
	module/library/app/com/taig/play/tmpltr/engine/html/head.scala
	module/library/app/com/taig/play/tmpltr/engine/html/header.scala
	module/library/app/com/taig/play/tmpltr/engine/html/hgroup.scala
	module/library/app/com/taig/play/tmpltr/engine/html/hr.scala
	module/library/app/com/taig/play/tmpltr/engine/html/html.scala
	module/library/app/com/taig/play/tmpltr/engine/html/i.scala
	module/library/app/com/taig/play/tmpltr/engine/html/iframe.scala
	module/library/app/com/taig/play/tmpltr/engine/html/img.scala
	module/library/app/com/taig/play/tmpltr/engine/html/input.scala
	module/library/app/com/taig/play/tmpltr/engine/html/ins.scala
	module/library/app/com/taig/play/tmpltr/engine/html/kbd.scala
	module/library/app/com/taig/play/tmpltr/engine/html/label.scala
	module/library/app/com/taig/play/tmpltr/engine/html/legend.scala
	module/library/app/com/taig/play/tmpltr/engine/html/li.scala
	module/library/app/com/taig/play/tmpltr/engine/html/link.scala
	module/library/app/com/taig/play/tmpltr/engine/html/map.scala
	module/library/app/com/taig/play/tmpltr/engine/html/mark.scala
	module/library/app/com/taig/play/tmpltr/engine/html/meta.scala
	module/library/app/com/taig/play/tmpltr/engine/html/meter.scala
	module/library/app/com/taig/play/tmpltr/engine/html/nav.scala
	module/library/app/com/taig/play/tmpltr/engine/html/noscript.scala
	module/library/app/com/taig/play/tmpltr/engine/html/obj.scala
	module/library/app/com/taig/play/tmpltr/engine/html/ol.scala
	module/library/app/com/taig/play/tmpltr/engine/html/optgroup.scala
	module/library/app/com/taig/play/tmpltr/engine/html/option.scala
	module/library/app/com/taig/play/tmpltr/engine/html/output.scala
	module/library/app/com/taig/play/tmpltr/engine/html/p.scala
	module/library/app/com/taig/play/tmpltr/engine/html/pre.scala
	module/library/app/com/taig/play/tmpltr/engine/html/progress.scala
	module/library/app/com/taig/play/tmpltr/engine/html/property/a.scala
	module/library/app/com/taig/play/tmpltr/engine/html/property/button.scala
	module/library/app/com/taig/play/tmpltr/engine/html/property/form.scala
	module/library/app/com/taig/play/tmpltr/engine/html/property/input.scala
	module/library/app/com/taig/play/tmpltr/engine/html/property/link.scala
	module/library/app/com/taig/play/tmpltr/engine/html/q.scala
	module/library/app/com/taig/play/tmpltr/engine/html/rp.scala
	module/library/app/com/taig/play/tmpltr/engine/html/rt.scala
	module/library/app/com/taig/play/tmpltr/engine/html/ruby.scala
	module/library/app/com/taig/play/tmpltr/engine/html/s.scala
	module/library/app/com/taig/play/tmpltr/engine/html/samp.scala
	module/library/app/com/taig/play/tmpltr/engine/html/script.scala
	module/library/app/com/taig/play/tmpltr/engine/html/section.scala
	module/library/app/com/taig/play/tmpltr/engine/html/small.scala
	module/library/app/com/taig/play/tmpltr/engine/html/span.scala
	module/library/app/com/taig/play/tmpltr/engine/html/strong.scala
	module/library/app/com/taig/play/tmpltr/engine/html/style.scala
	module/library/app/com/taig/play/tmpltr/engine/html/sub.scala
	module/library/app/com/taig/play/tmpltr/engine/html/summary.scala
	module/library/app/com/taig/play/tmpltr/engine/html/sup.scala
	module/library/app/com/taig/play/tmpltr/engine/html/table.scala
	module/library/app/com/taig/play/tmpltr/engine/html/tbody.scala
	module/library/app/com/taig/play/tmpltr/engine/html/td.scala
	module/library/app/com/taig/play/tmpltr/engine/html/tfoot.scala
	module/library/app/com/taig/play/tmpltr/engine/html/th.scala
	module/library/app/com/taig/play/tmpltr/engine/html/thead.scala
	module/library/app/com/taig/play/tmpltr/engine/html/time.scala
	module/library/app/com/taig/play/tmpltr/engine/html/title.scala
	module/library/app/com/taig/play/tmpltr/engine/html/tr.scala
	module/library/app/com/taig/play/tmpltr/engine/html/u.scala
	module/library/app/com/taig/play/tmpltr/engine/html/ul.scala
	module/library/app/com/taig/play/tmpltr/engine/html/variable.scala
	module/library/app/com/taig/play/tmpltr/engine/html/video.scala
	module/library/app/com/taig/play/tmpltr/engine/html/wbr.scala
	module/library/app/com/taig/play/tmpltr/markup/a.scala
	module/library/app/com/taig/play/tmpltr/markup/abbr.scala
	module/library/app/com/taig/play/tmpltr/markup/address.scala
	module/library/app/com/taig/play/tmpltr/markup/area.scala
	module/library/app/com/taig/play/tmpltr/markup/article.scala
	module/library/app/com/taig/play/tmpltr/markup/aside.scala
	module/library/app/com/taig/play/tmpltr/markup/audio.scala
	module/library/app/com/taig/play/tmpltr/markup/b.scala
	module/library/app/com/taig/play/tmpltr/markup/base.scala
	module/library/app/com/taig/play/tmpltr/markup/bdo.scala
	module/library/app/com/taig/play/tmpltr/markup/blockquote.scala
	module/library/app/com/taig/play/tmpltr/markup/body.scala
	module/library/app/com/taig/play/tmpltr/markup/br.scala
	module/library/app/com/taig/play/tmpltr/markup/button.scala
	module/library/app/com/taig/play/tmpltr/markup/canvas.scala
	module/library/app/com/taig/play/tmpltr/markup/caption.scala
	module/library/app/com/taig/play/tmpltr/markup/cite.scala
	module/library/app/com/taig/play/tmpltr/markup/code.scala
	module/library/app/com/taig/play/tmpltr/markup/col.scala
	module/library/app/com/taig/play/tmpltr/markup/colgroup.scala
	module/library/app/com/taig/play/tmpltr/markup/datalist.scala
	module/library/app/com/taig/play/tmpltr/markup/dd.scala
	module/library/app/com/taig/play/tmpltr/markup/del.scala
	module/library/app/com/taig/play/tmpltr/markup/details.scala
	module/library/app/com/taig/play/tmpltr/markup/dfn.scala
	module/library/app/com/taig/play/tmpltr/markup/dialog.scala
	module/library/app/com/taig/play/tmpltr/markup/div.scala
	module/library/app/com/taig/play/tmpltr/markup/dl.scala
	module/library/app/com/taig/play/tmpltr/markup/doctype.scala
	module/library/app/com/taig/play/tmpltr/markup/dt.scala
	module/library/app/com/taig/play/tmpltr/markup/em.scala
	module/library/app/com/taig/play/tmpltr/markup/embed.scala
	module/library/app/com/taig/play/tmpltr/markup/fieldset.scala
	module/library/app/com/taig/play/tmpltr/markup/figcaption.scala
	module/library/app/com/taig/play/tmpltr/markup/figure.scala
	module/library/app/com/taig/play/tmpltr/markup/footer.scala
	module/library/app/com/taig/play/tmpltr/markup/form.scala
	module/library/app/com/taig/play/tmpltr/markup/h.scala
	module/library/app/com/taig/play/tmpltr/markup/head.scala
	module/library/app/com/taig/play/tmpltr/markup/header.scala
	module/library/app/com/taig/play/tmpltr/markup/hgroup.scala
	module/library/app/com/taig/play/tmpltr/markup/hr.scala
	module/library/app/com/taig/play/tmpltr/markup/html.scala
	module/library/app/com/taig/play/tmpltr/markup/i.scala
	module/library/app/com/taig/play/tmpltr/markup/iframe.scala
	module/library/app/com/taig/play/tmpltr/markup/img.scala
	module/library/app/com/taig/play/tmpltr/markup/input.scala
	module/library/app/com/taig/play/tmpltr/markup/ins.scala
	module/library/app/com/taig/play/tmpltr/markup/kbd.scala
	module/library/app/com/taig/play/tmpltr/markup/keygen.scala
	module/library/app/com/taig/play/tmpltr/markup/label.scala
	module/library/app/com/taig/play/tmpltr/markup/legend.scala
	module/library/app/com/taig/play/tmpltr/markup/li.scala
	module/library/app/com/taig/play/tmpltr/markup/link.scala
	module/library/app/com/taig/play/tmpltr/markup/map.scala
	module/library/app/com/taig/play/tmpltr/markup/mark.scala
	module/library/app/com/taig/play/tmpltr/markup/meta.scala
	module/library/app/com/taig/play/tmpltr/markup/meter.scala
	module/library/app/com/taig/play/tmpltr/markup/nav.scala
	module/library/app/com/taig/play/tmpltr/markup/noscript.scala
	module/library/app/com/taig/play/tmpltr/markup/obj.scala
	module/library/app/com/taig/play/tmpltr/markup/ol.scala
	module/library/app/com/taig/play/tmpltr/markup/optgroup.scala
	module/library/app/com/taig/play/tmpltr/markup/option.scala
	module/library/app/com/taig/play/tmpltr/markup/output.scala
	module/library/app/com/taig/play/tmpltr/markup/p.scala
	module/library/app/com/taig/play/tmpltr/markup/param.scala
	module/library/app/com/taig/play/tmpltr/markup/pre.scala
	module/library/app/com/taig/play/tmpltr/markup/progress.scala
	module/library/app/com/taig/play/tmpltr/markup/q.scala
	module/library/app/com/taig/play/tmpltr/markup/rp.scala
	module/library/app/com/taig/play/tmpltr/markup/rt.scala
	module/library/app/com/taig/play/tmpltr/markup/ruby.scala
	module/library/app/com/taig/play/tmpltr/markup/s.scala
	module/library/app/com/taig/play/tmpltr/markup/samp.scala
	module/library/app/com/taig/play/tmpltr/markup/script.scala
	module/library/app/com/taig/play/tmpltr/markup/section.scala
	module/library/app/com/taig/play/tmpltr/markup/select.scala
	module/library/app/com/taig/play/tmpltr/markup/small.scala
	module/library/app/com/taig/play/tmpltr/markup/source.scala
	module/library/app/com/taig/play/tmpltr/markup/span.scala
	module/library/app/com/taig/play/tmpltr/markup/strong.scala
	module/library/app/com/taig/play/tmpltr/markup/style.scala
	module/library/app/com/taig/play/tmpltr/markup/sub.scala
	module/library/app/com/taig/play/tmpltr/markup/summary.scala
	module/library/app/com/taig/play/tmpltr/markup/sup.scala
	module/library/app/com/taig/play/tmpltr/markup/table.scala
	module/library/app/com/taig/play/tmpltr/markup/tbody.scala
	module/library/app/com/taig/play/tmpltr/markup/td.scala
	module/library/app/com/taig/play/tmpltr/markup/textarea.scala
	module/library/app/com/taig/play/tmpltr/markup/tfoot.scala
	module/library/app/com/taig/play/tmpltr/markup/th.scala
	module/library/app/com/taig/play/tmpltr/markup/thead.scala
	module/library/app/com/taig/play/tmpltr/markup/time.scala
	module/library/app/com/taig/play/tmpltr/markup/title.scala
	module/library/app/com/taig/play/tmpltr/markup/tr.scala
	module/library/app/com/taig/play/tmpltr/markup/u.scala
	module/library/app/com/taig/play/tmpltr/markup/ul.scala
	module/library/app/com/taig/play/tmpltr/markup/variable.scala
	module/library/app/com/taig/play/tmpltr/markup/video.scala
	module/library/app/com/taig/play/tmpltr/markup/wbr.scala
	module/library/app/com/taig/play/tmpltr/package.scala
	module/library/app/com/taig/tmpltr/Attributes.scala
	module/library/app/com/taig/tmpltr/HtmlNode.scala
	module/library/app/com/taig/tmpltr/Property.scala
	module/library/app/com/taig/tmpltr/Tag.scala
	module/library/app/com/taig/tmpltr/engine/bootstrap/button.scala
	module/library/app/com/taig/tmpltr/engine/bootstrap/caret.scala
	module/library/app/com/taig/tmpltr/engine/bootstrap/container.scala
	module/library/app/com/taig/tmpltr/engine/bootstrap/lead.scala
	module/library/app/com/taig/tmpltr/engine/bootstrap/page_header.scala
	module/library/app/com/taig/tmpltr/engine/bootstrap/property/button.scala
	module/library/app/com/taig/tmpltr/engine/html/a.scala
	module/library/app/com/taig/tmpltr/engine/html/abbr.scala
	module/library/app/com/taig/tmpltr/engine/html/address.scala
	module/library/app/com/taig/tmpltr/engine/html/area.scala
	module/library/app/com/taig/tmpltr/engine/html/article.scala
	module/library/app/com/taig/tmpltr/engine/html/aside.scala
	module/library/app/com/taig/tmpltr/engine/html/audio.scala
	module/library/app/com/taig/tmpltr/engine/html/b.scala
	module/library/app/com/taig/tmpltr/engine/html/base.scala
	module/library/app/com/taig/tmpltr/engine/html/bdo.scala
	module/library/app/com/taig/tmpltr/engine/html/blockquote.scala
	module/library/app/com/taig/tmpltr/engine/html/body.scala
	module/library/app/com/taig/tmpltr/engine/html/boilerplate.scala
	module/library/app/com/taig/tmpltr/engine/html/br.scala
	module/library/app/com/taig/tmpltr/engine/html/button.scala
	module/library/app/com/taig/tmpltr/engine/html/canvas.scala
	module/library/app/com/taig/tmpltr/engine/html/caption.scala
	module/library/app/com/taig/tmpltr/engine/html/cite.scala
	module/library/app/com/taig/tmpltr/engine/html/code.scala
	module/library/app/com/taig/tmpltr/engine/html/col.scala
	module/library/app/com/taig/tmpltr/engine/html/colgroup.scala
	module/library/app/com/taig/tmpltr/engine/html/datalist.scala
	module/library/app/com/taig/tmpltr/engine/html/dd.scala
	module/library/app/com/taig/tmpltr/engine/html/del.scala
	module/library/app/com/taig/tmpltr/engine/html/details.scala
	module/library/app/com/taig/tmpltr/engine/html/dfn.scala
	module/library/app/com/taig/tmpltr/engine/html/dialog.scala
	module/library/app/com/taig/tmpltr/engine/html/div.scala
	module/library/app/com/taig/tmpltr/engine/html/dl.scala
	module/library/app/com/taig/tmpltr/engine/html/doctype.scala
	module/library/app/com/taig/tmpltr/engine/html/dt.scala
	module/library/app/com/taig/tmpltr/engine/html/em.scala
	module/library/app/com/taig/tmpltr/engine/html/embed.scala
	module/library/app/com/taig/tmpltr/engine/html/fieldset.scala
	module/library/app/com/taig/tmpltr/engine/html/figcaption.scala
	module/library/app/com/taig/tmpltr/engine/html/figure.scala
	module/library/app/com/taig/tmpltr/engine/html/footer.scala
	module/library/app/com/taig/tmpltr/engine/html/form.scala
	module/library/app/com/taig/tmpltr/engine/html/h.scala
	module/library/app/com/taig/tmpltr/engine/html/h1.scala
	module/library/app/com/taig/tmpltr/engine/html/h2.scala
	module/library/app/com/taig/tmpltr/engine/html/h3.scala
	module/library/app/com/taig/tmpltr/engine/html/h4.scala
	module/library/app/com/taig/tmpltr/engine/html/h5.scala
	module/library/app/com/taig/tmpltr/engine/html/h6.scala
	module/library/app/com/taig/tmpltr/engine/html/head.scala
	module/library/app/com/taig/tmpltr/engine/html/header.scala
	module/library/app/com/taig/tmpltr/engine/html/hgroup.scala
	module/library/app/com/taig/tmpltr/engine/html/hr.scala
	module/library/app/com/taig/tmpltr/engine/html/html.scala
	module/library/app/com/taig/tmpltr/engine/html/i.scala
	module/library/app/com/taig/tmpltr/engine/html/iframe.scala
	module/library/app/com/taig/tmpltr/engine/html/img.scala
	module/library/app/com/taig/tmpltr/engine/html/input.scala
	module/library/app/com/taig/tmpltr/engine/html/ins.scala
	module/library/app/com/taig/tmpltr/engine/html/kbd.scala
	module/library/app/com/taig/tmpltr/engine/html/label.scala
	module/library/app/com/taig/tmpltr/engine/html/legend.scala
	module/library/app/com/taig/tmpltr/engine/html/li.scala
	module/library/app/com/taig/tmpltr/engine/html/link.scala
	module/library/app/com/taig/tmpltr/engine/html/map.scala
	module/library/app/com/taig/tmpltr/engine/html/mark.scala
	module/library/app/com/taig/tmpltr/engine/html/meta.scala
	module/library/app/com/taig/tmpltr/engine/html/meter.scala
	module/library/app/com/taig/tmpltr/engine/html/nav.scala
	module/library/app/com/taig/tmpltr/engine/html/noscript.scala
	module/library/app/com/taig/tmpltr/engine/html/obj.scala
	module/library/app/com/taig/tmpltr/engine/html/ol.scala
	module/library/app/com/taig/tmpltr/engine/html/optgroup.scala
	module/library/app/com/taig/tmpltr/engine/html/option.scala
	module/library/app/com/taig/tmpltr/engine/html/output.scala
	module/library/app/com/taig/tmpltr/engine/html/p.scala
	module/library/app/com/taig/tmpltr/engine/html/pre.scala
	module/library/app/com/taig/tmpltr/engine/html/progress.scala
	module/library/app/com/taig/tmpltr/engine/html/property/a.scala
	module/library/app/com/taig/tmpltr/engine/html/property/button.scala
	module/library/app/com/taig/tmpltr/engine/html/property/form.scala
	module/library/app/com/taig/tmpltr/engine/html/property/input.scala
	module/library/app/com/taig/tmpltr/engine/html/property/link.scala
	module/library/app/com/taig/tmpltr/engine/html/q.scala
	module/library/app/com/taig/tmpltr/engine/html/rp.scala
	module/library/app/com/taig/tmpltr/engine/html/rt.scala
	module/library/app/com/taig/tmpltr/engine/html/ruby.scala
	module/library/app/com/taig/tmpltr/engine/html/s.scala
	module/library/app/com/taig/tmpltr/engine/html/samp.scala
	module/library/app/com/taig/tmpltr/engine/html/script.scala
	module/library/app/com/taig/tmpltr/engine/html/section.scala
	module/library/app/com/taig/tmpltr/engine/html/small.scala
	module/library/app/com/taig/tmpltr/engine/html/span.scala
	module/library/app/com/taig/tmpltr/engine/html/strong.scala
	module/library/app/com/taig/tmpltr/engine/html/style.scala
	module/library/app/com/taig/tmpltr/engine/html/sub.scala
	module/library/app/com/taig/tmpltr/engine/html/summary.scala
	module/library/app/com/taig/tmpltr/engine/html/sup.scala
	module/library/app/com/taig/tmpltr/engine/html/table.scala
	module/library/app/com/taig/tmpltr/engine/html/tbody.scala
	module/library/app/com/taig/tmpltr/engine/html/td.scala
	module/library/app/com/taig/tmpltr/engine/html/tfoot.scala
	module/library/app/com/taig/tmpltr/engine/html/th.scala
	module/library/app/com/taig/tmpltr/engine/html/thead.scala
	module/library/app/com/taig/tmpltr/engine/html/time.scala
	module/library/app/com/taig/tmpltr/engine/html/title.scala
	module/library/app/com/taig/tmpltr/engine/html/tr.scala
	module/library/app/com/taig/tmpltr/engine/html/u.scala
	module/library/app/com/taig/tmpltr/engine/html/ul.scala
	module/library/app/com/taig/tmpltr/engine/html/variable.scala
	module/library/app/com/taig/tmpltr/engine/html/video.scala
	module/library/app/com/taig/tmpltr/engine/html/wbr.scala
	module/library/app/com/taig/tmpltr/markup/a.scala
	module/library/app/com/taig/tmpltr/markup/abbr.scala
	module/library/app/com/taig/tmpltr/markup/address.scala
	module/library/app/com/taig/tmpltr/markup/area.scala
	module/library/app/com/taig/tmpltr/markup/article.scala
	module/library/app/com/taig/tmpltr/markup/aside.scala
	module/library/app/com/taig/tmpltr/markup/audio.scala
	module/library/app/com/taig/tmpltr/markup/b.scala
	module/library/app/com/taig/tmpltr/markup/base.scala
	module/library/app/com/taig/tmpltr/markup/bdo.scala
	module/library/app/com/taig/tmpltr/markup/blockquote.scala
	module/library/app/com/taig/tmpltr/markup/body.scala
	module/library/app/com/taig/tmpltr/markup/br.scala
	module/library/app/com/taig/tmpltr/markup/button.scala
	module/library/app/com/taig/tmpltr/markup/canvas.scala
	module/library/app/com/taig/tmpltr/markup/caption.scala
	module/library/app/com/taig/tmpltr/markup/cite.scala
	module/library/app/com/taig/tmpltr/markup/code.scala
	module/library/app/com/taig/tmpltr/markup/col.scala
	module/library/app/com/taig/tmpltr/markup/colgroup.scala
	module/library/app/com/taig/tmpltr/markup/datalist.scala
	module/library/app/com/taig/tmpltr/markup/dd.scala
	module/library/app/com/taig/tmpltr/markup/del.scala
	module/library/app/com/taig/tmpltr/markup/details.scala
	module/library/app/com/taig/tmpltr/markup/dfn.scala
	module/library/app/com/taig/tmpltr/markup/dialog.scala
	module/library/app/com/taig/tmpltr/markup/div.scala
	module/library/app/com/taig/tmpltr/markup/dl.scala
	module/library/app/com/taig/tmpltr/markup/doctype.scala
	module/library/app/com/taig/tmpltr/markup/dt.scala
	module/library/app/com/taig/tmpltr/markup/em.scala
	module/library/app/com/taig/tmpltr/markup/embed.scala
	module/library/app/com/taig/tmpltr/markup/fieldset.scala
	module/library/app/com/taig/tmpltr/markup/figcaption.scala
	module/library/app/com/taig/tmpltr/markup/figure.scala
	module/library/app/com/taig/tmpltr/markup/footer.scala
	module/library/app/com/taig/tmpltr/markup/form.scala
	module/library/app/com/taig/tmpltr/markup/h.scala
	module/library/app/com/taig/tmpltr/markup/head.scala
	module/library/app/com/taig/tmpltr/markup/header.scala
	module/library/app/com/taig/tmpltr/markup/hgroup.scala
	module/library/app/com/taig/tmpltr/markup/hr.scala
	module/library/app/com/taig/tmpltr/markup/html.scala
	module/library/app/com/taig/tmpltr/markup/i.scala
	module/library/app/com/taig/tmpltr/markup/iframe.scala
	module/library/app/com/taig/tmpltr/markup/img.scala
	module/library/app/com/taig/tmpltr/markup/input.scala
	module/library/app/com/taig/tmpltr/markup/ins.scala
	module/library/app/com/taig/tmpltr/markup/kbd.scala
	module/library/app/com/taig/tmpltr/markup/keygen.scala
	module/library/app/com/taig/tmpltr/markup/label.scala
	module/library/app/com/taig/tmpltr/markup/legend.scala
	module/library/app/com/taig/tmpltr/markup/li.scala
	module/library/app/com/taig/tmpltr/markup/link.scala
	module/library/app/com/taig/tmpltr/markup/map.scala
	module/library/app/com/taig/tmpltr/markup/mark.scala
	module/library/app/com/taig/tmpltr/markup/meta.scala
	module/library/app/com/taig/tmpltr/markup/meter.scala
	module/library/app/com/taig/tmpltr/markup/nav.scala
	module/library/app/com/taig/tmpltr/markup/noscript.scala
	module/library/app/com/taig/tmpltr/markup/obj.scala
	module/library/app/com/taig/tmpltr/markup/ol.scala
	module/library/app/com/taig/tmpltr/markup/optgroup.scala
	module/library/app/com/taig/tmpltr/markup/option.scala
	module/library/app/com/taig/tmpltr/markup/output.scala
	module/library/app/com/taig/tmpltr/markup/p.scala
	module/library/app/com/taig/tmpltr/markup/param.scala
	module/library/app/com/taig/tmpltr/markup/pre.scala
	module/library/app/com/taig/tmpltr/markup/progress.scala
	module/library/app/com/taig/tmpltr/markup/q.scala
	module/library/app/com/taig/tmpltr/markup/rp.scala
	module/library/app/com/taig/tmpltr/markup/rt.scala
	module/library/app/com/taig/tmpltr/markup/ruby.scala
	module/library/app/com/taig/tmpltr/markup/s.scala
	module/library/app/com/taig/tmpltr/markup/samp.scala
	module/library/app/com/taig/tmpltr/markup/script.scala
	module/library/app/com/taig/tmpltr/markup/section.scala
	module/library/app/com/taig/tmpltr/markup/select.scala
	module/library/app/com/taig/tmpltr/markup/small.scala
	module/library/app/com/taig/tmpltr/markup/source.scala
	module/library/app/com/taig/tmpltr/markup/span.scala
	module/library/app/com/taig/tmpltr/markup/strong.scala
	module/library/app/com/taig/tmpltr/markup/style.scala
	module/library/app/com/taig/tmpltr/markup/sub.scala
	module/library/app/com/taig/tmpltr/markup/summary.scala
	module/library/app/com/taig/tmpltr/markup/sup.scala
	module/library/app/com/taig/tmpltr/markup/table.scala
	module/library/app/com/taig/tmpltr/markup/tbody.scala
	module/library/app/com/taig/tmpltr/markup/td.scala
	module/library/app/com/taig/tmpltr/markup/textarea.scala
	module/library/app/com/taig/tmpltr/markup/tfoot.scala
	module/library/app/com/taig/tmpltr/markup/th.scala
	module/library/app/com/taig/tmpltr/markup/thead.scala
	module/library/app/com/taig/tmpltr/markup/time.scala
	module/library/app/com/taig/tmpltr/markup/title.scala
	module/library/app/com/taig/tmpltr/markup/tr.scala
	module/library/app/com/taig/tmpltr/markup/u.scala
	module/library/app/com/taig/tmpltr/markup/ul.scala
	module/library/app/com/taig/tmpltr/markup/variable.scala
	module/library/app/com/taig/tmpltr/markup/video.scala
	module/library/app/com/taig/tmpltr/markup/wbr.scala
	module/library/app/com/taig/tmpltr/package.scala
	module/sample/public/stylesheet/prettify.css
	project/Build.scala
	project/plugins.sbt
Merge branch 'develop'

Conflicts:
	documentation/public/stylesheet/prettify.css
Merge branch 'develop'

Conflicts:
	deploy.sh
	project/Build.scala
Merge branch 'develop'
Merge branch 'develop'
Removed google analytics token.
Moved version information from build.sbt to Build.scala
Moved version information from build.sbt to Build.scala in Documentation project
Added sbt buildinfo plugin to fetch the project version within the documentation
Merge branch 'release-1.0.0-beta'
Merge branch 'master' of https://github.com/Taig/Play-Tmpltr

Conflicts:
	README.md
Merge branch 'master' into develop