Refactoring

Change-Id: I2b6ff178cf9a2f0485281bed2a3ea94e6171bfc9
Merge branch 'master' of git@github.com:Netsensia/netsensia-zf2-skeleton.git