Pull master into dev

pull the changes made to master into dev
(New Modules is now dev