CloudSalesManager-20130606
Merge branch 'master' of https://github.com/nbedoui/CloudSalesManager

Conflicts:
	.DS_Store
	modules/common/common.js
	modules/common/params.jade
	public/css/mw.css
	routes/index.js