Squashed commit of the following:

commit 9e49aa00e9d19aa96d7ba426b13f353d2a64e457
Author: Kristian <kristian.mort@aalto.fi>
Date:   Mon Jul 15 16:02:04 2013 +0300

    Merge completed.

commit 41aacaf8700e66d53f5ae8246ecbf0e315ef178f
Author: Kristian <kristian.mort@aalto.fi>
Date:   Mon Jul 15 15:52:21 2013 +0300
Declare the branches equal...
    Revert "Merge branch 'master' into develop"

    This reverts commit f52a02d1a037af401f0289ed820987498d651a2d, reversing
    changes made to 1cc621fa8a6a613b0d32ddeb9d91c94344a113ba.