set config for RESTFull server
save new spa
Add bower
Merge origin/master

Conflicts:
	views/layout.ejs