20131009
Merge branch 'develop' of https://github.com/richelbilderbeek/ProjectRichelBilderbeek into develop
Trivial merge