janno42/EvaP — pull request #2 by janno42 (2013-11-10 20:17:16+00:00)
Title: Merge pull request #1 from janno42/master

Merge master into develop