merge develop

CONTRIBUTING.md

@@ -70,4 +70,4 @@ We're not really strict with Sass code but adhering to these guidelines will hel
 
 Our documentation is built with [Jekyll](http://jekyllrb.com/). Get familiar with it.
 
-1. Changes to the documentation must me submitted to the ``gh-pages``branch.
+1. Changes to the documentation must me submitted to [this separate repository](https://github.com/sapo/Ink-doc/).

README.md

@@ -1,10 +1,10 @@
-#Welcome to [Ink](http://ink.sapo.pt) [![Build Status](https://travis-ci.org/sapo/Ink.svg?branch=staging)](https://travis-ci.org/sapo/Ink)
+#Welcome to [Ink](http://ink.sapo.pt) [![Build Status](https://travis-ci.org/sapo/Ink.svg?branch=staging)](https://travis-ci.org/sapo/Ink) [![devDependency Status](https://david-dm.org/sapo/Ink/dev-status.svg)](https://david-dm.org/sapo/Ink#info=devDependencies)
 
 Ink is an interface kit for quick development of web interfaces, simple to use and expand on. It uses a combination of HTML, CSS and JavaScript to offer modern solutions for building layouts, display common interface elements and implement interactive features that are content-centric and user friendly for both your audience and your designers & developers.
 
 Ink is part of [SAPOs Open Source Software initiative](http://oss.sapo.pt).
 
-## Current Version: 3.1.0
+## Current Version: 3.1.1
 
 You can read our full documentation, examples and recipes in http://ink.sapo.pt
 
@@ -127,7 +127,7 @@ If you want to build from our source code, you'll need to install a few things:
 * #### Windows
 
 If you don't need to rebuild Javascript code you can just use [Scout](http://mhs.github.io/scout-app/) which is a nice, free and cross platform Sass/Compass compiler.
-  
+
 Building on Windows is a lot tricker so we won't get into details on how to install all the required tools. Instead here's a list of usefull pages you'll need to read while trying this endeavour:
 
   * [Getting started with Sass and Compass](http://thesassway.com/beginner/getting-started-with-sass-and-compass)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Ink",
-  "version": "3.1.0",
+  "version": "3.0.5",
   "description": "An HTML5/CSS3 framework used at SAPO for fast and efficient website design and prototyping.",
   "keywords": [
     "HTML",
@@ -16,15 +16,15 @@
     "node_modules"
   ],
   "dependencies": {
-    "font-awesome": "~4.1.0",
-    "animate.css": "~3.1.0",
+    "font-awesome": "~4.2.0",
+    "animate.css": "~3.2.0",
     "bower-compass-core": ">=0.0.1"
   },
   "devDependencies": {
     "qunit": "~1.12.0",
     "sinonjs-built": "~1.8.2",
     "sinon-qunit": "~1.0.0",
-    "syn": "~0.0.2",
+    "syn": "fabiosantoscode/syn#7bf76c7d1c872bca9da647add0e517896aae19d5",
     "qunit-tap": "~1.4.2"
   }
 }