Update History and Credits based on recent patches

2 files changed, 8 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index b5aec411..9c1ac136 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3,7 +3,7 @@ CREDITS
 
 Project Administration & Major Projects
 
-- Robert Treat
+- Robert Treat (xzilla) 
 - Jehan-Guillaume (ioguix) De Rorthais
 
 Translators
@@ -50,6 +50,7 @@ Look & Feel
 - Davey (CSS)
 - ioguix (Cappuccino theme)
 - Tomasz Pala (Gotar theme)
+- Felipe Figueroa (Bootstrap theme)
 
 Contributors
 
@@ -77,6 +78,7 @@ Contributors
 - Kristoffer `spq` Janke
 - Leonardo Augusto Sapiras (Improve phpPgAdmin ergonomy during the GSoC 2010, with ioguix as mentor)
 - Julien Rouhaud, aka. rjuju (nested groups)
+- Felipe Figueroa aka. amenadiel
 
 Third Party Libraries
 
@@ -94,7 +96,7 @@ Project resources:
 
 Ongoing contributors:
 
-- Omniti ( http://omniti.com/ ) - sponsors developpment as Robert Treat employer
+- OmniTI ( http://omniti.com/ ) - sponsors developpment as Robert Treat employer
 - Dalibo ( http://dalibo.com ) - sponsors developpment as Jehan-Guillaume (ioguix) de Rorthais employer
 
 Feature contributors:
diff --git a/HISTORY b/HISTORY
index 52c51bef..44eff550 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9,10 +9,14 @@ Released: January 2015?
 Features
 * Full support for PostgreSQL 9.3 and 9.4
 * Improved Spanish translation support
+* Add support for brows/select navigation tabs (firzen)
+* Add new theme, "bootstrap" (amenadiel)
+* Improved support for json/jsonb
 
 Bugs
 * Fix bug in Turkish translation which caused failed ajax responses 
 * Account for Blocked field in admin processes Selenium test
+* Properly handle column comments 
 
 Incompatabilities
 * Dropped testing of 8.4, which is now EOL