[#24] Add a comment to cause a conflict

* Testing Pull Request functionality on conflicts, no change in
  behavior
Merge branch 'develop' into feature/24

Conflicts:
	src/akvo/flow_services/stats.clj