Added spring actuator module + some code cleaning
Merge branch 'develop'