merge all features from dev branches
Merge pull request #3 from guardian/parkotron-feature-merge

Merge all features from dev branches into our master