DEVELOPMENT: di 28 okt 2014 21:13:41 CET
MERGE: di 28 okt 2014 21:13:44 CET
Merge branch 'development' into test
Merge branch 'test' of https://github.com/theotheu/hook-test into test