Changed stuff from nos to Atom fixed metadata
Merge remote-tracking branch 'upstream/master'

Conflicts:
	metadata.json
bump for 3.12
Merge pull request #5 from iridis-discurro/master

bump for 3.12
Merge remote-tracking branch 'upstream/master'