Raul Ochoa c84ed0a4b4 Merge branch 'master' into pgraster ...

Conflicts:
	npm-shrinkwrap.json
	package.json

2014-11-05 14:54:59 +01:00

..

development.js.example

Merge branch 'master' into pgraster

2014-11-05 14:54:59 +01:00

production.js.example

Merge branch 'master' into pgraster

2014-11-05 14:54:59 +01:00

staging.js.example

Merge branch 'master' into pgraster

2014-11-05 14:54:59 +01:00

test.js.example

Merge branch 'master' into pgraster

2014-11-05 14:54:59 +01:00