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