diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..8d67bc7a5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+
+[*.{java,xml}]
+indent_size = 4
+trim_trailing_whitespace = true
diff --git a/.tern-project b/.tern-project
deleted file mode 100644
index b5dc2b528..000000000
--- a/.tern-project
+++ /dev/null
@@ -1 +0,0 @@
-{"ide":{"scriptPaths":[{"type":"FOLDER","path":"src/main/webapp/bower_components"}]},"plugins":{"guess-types":{},"node":{},"angular":{}},"libs":["ecma5","browser"]}
\ No newline at end of file