Merge remote branch '3dev/dev' into dev
Make public/js/directives.js minification friendly
Merge pull request #9 from unlight/feature/tiny-improvements

Make public/js/directives.js minification friendly