save feature integrated
latest atmosphere with bugfixed and save capability
Merge branch 'master' into stable

Conflicts:
	Gemfile.lock