akvo/akvo-rsr — pull request #429 by rumca (2014-01-20 13:30:41+00:00)
Title: Satsuma Release Candidate

merge develop to release/candidate for satsuma release