Marc: Started changing everything to nimbus.
Merge branch 'dev' of https://github.com/FCPDIT/TeamProject.git into dev
Marc: started chaning everything to nimbus