merge change master => develop
Merge branch 'develop' of https://github.com/nahuelbe/eis-macaya1 into develop
Travis configuration for deployment added
Merge branch 'develop' of github.com:nahuelbe/eis-macaya1 into develop