Merge branch 'master' into develop
[#38] New flow services version

* Includes new version of `exporterapplet.jar` that sorts out issue https://github.com/akvo/akvo-flow/issues/797#issuecomment-57149696
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	project.clj
[#41] Update project verison

* Incorporate exporterapplet changes. See issue https://github.com/akvo/akvo-flow/issues/847
Merge branch 'develop'