Updates some default values
Merge branch 'master' of github.com:guavestudios/translatetool

Conflicts:
	app/config.dev.json