I have no idea what I'm doing D:
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/dev'
Small fixes, again
Merge pull request #4209 from Faerdan/dev

Updated how NanoUI renders templates, using JSRender without the JSViews data-linking.
Merge pull request #4206 from RKF45/fixes

Small fixes maybe?
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev