Merge branch 'feature/2.0'

deacons · Jan 3, 2015 · 1321123 · 1321123
2 parents eca19bf + 22d116c
commit 1321123
Show file tree

Hide file tree

Showing 512 changed files with 20,883 additions and 65,169 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/TDA-Enrichment.iml b/.idea/TDA-Enrichment.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/jsLinters/jslint.xml b/.idea/jsLinters/jslint.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml