diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..a487eadb4
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,38 @@
+### 0.9 - 2017-06-15
+
+* New features
+  * Budgets
+  * Basic polls
+  * Collaborative legistlation
+  * Custom pages
+  * GraphQL API
+  * Improved admin section
+* Enhancements
+  * Improved admin section
+  * Rails 4.2.8
+  * Ruby 2.3.2
+* Bug fixes
+  * CKEditor locale compilation fixed
+  * Fixed bugs in mobile layouts
+* Deprecations
+  * SpendingProposals are deprecated now in favor of Budgets
+
+### 0.8 - 2016-07-21
+
+* New features
+  * Support for customization schema, vía specific custom files, assets and folders
+* Enhancements
+  * Rails 2.4.7
+  * Ruby 2.3.1
+* Bug fixes
+  * Fixed bug causing errors on user deletion
+
+### 0.7 - 2016-04-25
+
+* New features
+  * Debates
+  * Proposals
+  * Basic Spending Proposals
+* Enhancements
+  * Rails 2.4.6
+  * Ruby 2.2.3
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT_EN.md b/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT_EN.md
rename to CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING_EN.md b/CONTRIBUTING.md
similarity index 83%
rename from CONTRIBUTING_EN.md
rename to CONTRIBUTING.md
index 2c5f6a591..3147d1e4a 100644
--- a/CONTRIBUTING_EN.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,16 @@
 # How to Contribute to this Project
 
-## Team members
+## Core team members
 
-* Raimond Garcia [github](https://github.com/voodoorai2000) | [twitter](https://twitter.com/voodoorai2000)
+* Raimond García [github](https://github.com/voodoorai2000) | [twitter](https://twitter.com/voodoorai2000)
 * Juanjo Bazán [github](https://github.com/xuanxu) | [twitter](https://twitter.com/xuanxu)
 * Enrique García Cota [github](https://github.com/kikito) | [twitter](https://twitter.com/otikik)
-* Alberto Garcia Cabeza [github](https://github.com/decabeza) | [twitter](https://twitter.com/decabeza)
+* Alberto García Cabeza [github](https://github.com/decabeza) | [twitter](https://twitter.com/decabeza)
+* Alberto Calderón [github](https://github.com/bertocq) | [twitter](https://twitter.com/bertocq)
 
 ## Code of conduct
 
-The team members and the project's community adopts an inclusive Code of Conduct that you can read in the [CODE_OF_CONDUCT_EN.md](CODE_OF_CONDUCT_EN.md) file.
+The core team members and the project's community adopts an inclusive Code of Conduct that you can read in the [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) file.
 
 ## Report an issue
 
diff --git a/CONTRIBUTING_ES.md b/CONTRIBUTING_ES.md
index 6be8be9cd..b981bc408 100644
--- a/CONTRIBUTING_ES.md
+++ b/CONTRIBUTING_ES.md
@@ -2,10 +2,11 @@
 
 ## Miembros del equipo
 
-* Raimond Garcia [github](https://github.com/voodoorai2000) | [twitter](https://twitter.com/voodoorai2000)
+* Raimond García [github](https://github.com/voodoorai2000) | [twitter](https://twitter.com/voodoorai2000)
 * Juanjo Bazán [github](https://github.com/xuanxu) | [twitter](https://twitter.com/xuanxu)
 * Enrique García Cota [github](https://github.com/kikito) | [twitter](https://twitter.com/otikik)
-* Alberto Garcia Cabeza [github](https://github.com/decabeza) | [twitter](https://twitter.com/decabeza)
+* Alberto García Cabeza [github](https://github.com/decabeza) | [twitter](https://twitter.com/decabeza)
+* Alberto Calderón [github](https://github.com/bertocq) | [twitter](https://twitter.com/bertocq)
 
 ## Código de conducta
 
diff --git a/README.md b/README.md
index b4eee154a..380d03031 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Run the app locally:
 bin/rails s
 ```
 
-Prerequisites for testing: install PhantomJS >= 1.9.8
+Prerequisites for testing: install PhantomJS >= 2.1.1
 
 Run the tests with:
 
@@ -102,4 +102,4 @@ Code published under AFFERO GPL v3 (see [LICENSE-AGPLv3.txt](LICENSE-AGPLv3.txt)
 
 ## Contributions
 
-See [CONTRIBUTING_EN.md](CONTRIBUTING_EN.md)
+See [CONTRIBUTING.md](CONTRIBUTING.md)
diff --git a/README_ES.md b/README_ES.md
index 5f2f4843d..9a57b1f18 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -51,7 +51,7 @@ Para ejecutar la aplicación en local:
 bin/rails s
 ```
 
-Prerequisitos para los tests: tener instalado PhantomJS >= 1.9.8
+Prerequisitos para los tests: tener instalado PhantomJS >= 2.1.1
 
 Para ejecutar los tests: