Use (again) EJS to template
browser: Remove unused parameter
server: Put script tag at a better place

Replace "  </body>" by "  <script>...</script>\n</body>"
instead of "  \n<script>...</script></body>"
Preserve line numbers

Errors shown by EJS will have correct line number
Improve conflict finder
Update gulp to 3.7.0
browser: Stop creating embedded function for notifyRendered
Handle partial