updated it all
Merge branch 'new-rework' of https://github.com/araquach/calculator into new-rework

Conflicts:
	css/calculator.css
	protected/models/ServiceSelectForm.php
More adaptations