[#24] Fixes wrong reference to fstats-path
[#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
Merge pull request #25 from akvo/feature/24

[#24] Fixes wrong reference to fstats-path
[#26] Move uploads and reports path to /var/tmp
[#27] Adds akvoflow-dev2 to the list of dev instances
[#26] Update project version
[#26] Generate file within domain partition

Useful when trying to recover some file, just filter reports by
domain and survey id, e.g.

    find /var/tmp/akvo/ -name '*ID*' -path '*akvoflowsandbox*'
[#26] Removes wrong code
Merge pull request #28 from akvo/feature/27

[#27] Adds akvoflow-dev2 to the list of dev instances
[#26] Modify reported path to the client when report is in cache

Since we introduce a new folder (base-url), we need to report the new
path back to the client to be able to download the file
Merge pull request #29 from akvo/feature/26

Feature/26
Merge branch 'develop'