local execution support is added
Merge branch 'master' of https://github.com/davidich/elexir

Conflicts:  APPLICATION/Scripts/main.js