Merge branch 'release/0.3.1' into devel

* release/0.3.1:
  Update Gemfile.lock accordingly
  bump to version '0.3.1'
hotfix for travis

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
hotfix 2 for travis

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
safeguard on license generation in puppet modules

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
add parsing

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
upgrade template

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
update puppet modules

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
do not initialize git-flow in the rspec

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
do not initialize git-flow in the rspec

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
do not initialize git-flow in the rspec 2

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
add templates configuration

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
bump to version '0.3.2'

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
Update Gemfile.lock accordingly

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
Merge branch 'release/0.3.2' into production

* release/0.3.2:
  Update Gemfile.lock accordingly
  bump to version '0.3.2'
  add templates configuration
  do not initialize git-flow in the rspec 2
  do not initialize git-flow in the rspec
  do not initialize git-flow in the rspec
  update puppet modules
  upgrade template
  add parsing
  safeguard on license generation in puppet modules
  hotfix 2 for travis
  hotfix for travis