Merge branch 'testing' of github.com:ManuelSchneid3r/albert into testing

Conflicts:
	src/services/calculator/calculator.cpp
	src/services/calculator/calculator.h
Merge branch 'testing' of github.com:ManuelSchneid3r/albert into testing