akvo/akvo-rsr — pull request #693 by KasperBrandt (2014-07-28 14:47:37+00:00)
Title: [#688] Merge develop into RC for testing

@zzgvh Can you check / merge?