Merge with master using new build

Author: jabbany

.editorconfig

@@ -0,0 +1,22 @@
+# editorconfig.org
+root = true
+
+[*]
+end_of_line  = lf
+charset      = utf-8
+trim_trailing_whitespace = true
+insert_final_newline     = true
+
+[*.js]
+indent_style = tab
+
+[*.css]
+indent_style = space
+indent_size  = 2
+tab_width    = 2
+
+[*.coffee]
+indent_style = space
+indent_size  = 2
+tab_width    = 2
+

.gitignore

@@ -0,0 +1,8 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+#
+*.iml
+/node_modules/*