update to rails 4.0
Merge branch 'master' of https://github.com/spmno/MenuServer

Conflicts:
	.idea/.generators
	.idea/MenuServer.iml
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml
	Gemfile