0.0.0
Merge branch 'master' into develop

Conflicts:
	config/initializers/version.rb
Fix database