first iteration
Merge pull request #77 from baasbox/master

update from origin master
Merge branch 'opti' of https://github.com/giastfader/baasbox
Merge pull request #78 from giastfader/reactive

First iteration
Merge pull request #575 from giastfader/opti

first iteration