Initial commit
Merge branch 'master' of http://github.com/sboerrigter/development into develop