getter places api
app api places getters
Merge remote-tracking branch 'origin/realAPI'

Conflicts:
	config/config.json
	models/Place.js
	routes/index.js
app api places getters 2
app api places getters 2
Merge branch 'master' into realAPI

Conflicts:
	routes/index.js
test
fixed model place
Merge remote-tracking branch 'origin/realAPI' into test

Conflicts:
	app.js
test 2