just edited through running
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/app_props.properties