Module upgrades and additions done on server
modify .gitignore
Merge