Merge branch 'release/0.3.3' into devel

* release/0.3.3:
  Update Gemfile.lock accordingly
  bump to version '0.3.3'
upgrade templates

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

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

Signed-off-by: Sebastien Varrette <sebastien.varrette@uni.lu>
correst rspec

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

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.4' into production

* release/0.3.4:
  Update Gemfile.lock accordingly
  bump to version '0.3.4'
  correst rspec
  add diffy gem dep
  better template management
  upgrade templates