Merge pull request #1 from rnowm/master

Adding style changes from @rnowm
Add gaia-building-blocks as a submodule
Merge pull request #2 from ferjm/master

Add gaia-building-blocks as a submodule
A little bit preatier
fixed conflict