Modify templates for ink framework
Added tag INK Port for changeset 72ba382eb035
nginx rewrite strips the '+' symbol which then prevents finding the
matching page, so hack to replaace it.
Spelling correction
Sync with BS3 master
Merge with sync
Merge with master on github
Merge with github