Merge changes and resolve conflicts.

Hi Esteban
I've merged the current master into your branch and resolved the conflicts manually so your branch can be merged faster.

The following files conflicted:
  * run-tests.sh:
    * Removed content (a7f71b3a9f972bf2088d6cc02e4052a5450996a0)   
  * Makefile:
    * Use wildcard for handlebars (d31fbff1c3070ffdc77e60f4686a1a1d212e6b5d)
    * Call scripts/unit (a7f71b3a9f972bf2088d6cc02e4052a5450996a0)