Include 'alarm' in measurement series
Merge pull request #58 from sigurdsa/alarms-in-measurement-series

Include 'alarm' in measurement series
Filter measurements by time
Merge branch 'master' of https://github.com/sigurdsa/angelika-api into post-measurement
removed space, test written
Add measurement unit migration