commit for deploy on AWS
frontend skeleton
commit for deploy on AWS
Merge remote-tracking branch 'origin/master'
Merge branch 'realAPI'

Conflicts:
	config/config.json
Nikolaich
new google map object
Merge remote-tracking branch 'origin/master'
add icons for map
getter places api
app name getter
add font, remake design
show/hide panel
add icons css, remake design
change port
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/realAPI'

Conflicts:
	config/config.json
	models/Place.js
	routes/index.js
Merge branch 'master' into realAPI

Conflicts:
	routes/index.js
fixed model place