Merge branch 'master' of https://github.com/OpenBuildings/services-manager

Conflicts:
classes/Kohana/Service/Googleanalytics.php
Merged