Ashenmaster/hourglass_development_wp — pull request #1 by Ashenmaster (2014-05-02 10:29:11+00:00)
Title: Merge state

Merging merge state and master branch