menu_items on server, menu_item_desc
Merge branch 'master' of https://github.com/minardi/R-Soft

Conflicts:
	client/app/scripts/views/MenuItem.js
	client/app/scripts/views/MenuItemCollectionView.js
	client/app/scripts/views/MenuItemDescCollView.js
	server/RSoft/public/app/scripts/main.js
	server/RSoft/public/app/scripts/templates.js
	server/RSoft/public/app/styles/main.css
Merge branch 'master' of https://github.com/minardi/R-Soft

Conflicts:
	client/app/scripts/views/MenuItem.js
	client/app/scripts/views/MenuItemCollectionView.js
	client/app/scripts/views/MenuItemDescCollView.js
	server/RSoft/public/app/scripts/main.js
	server/RSoft/public/app/scripts/templates.js
	server/RSoft/public/app/styles/main.css